Skip to content

Commit 1786716

Browse files
aslakhellesoyaslakhellesoy
committed
[maven-release-plugin] prepare release v1.1.0
1 parent 845c027 commit 1786716

File tree

21 files changed

+105
-138
lines changed

21 files changed

+105
-138
lines changed

‎clojure/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>info.cukes</groupId>
76
<artifactId>cucumber-jvm</artifactId>
87
<relativePath>../pom.xml</relativePath>
9-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
109
</parent>
1110

1211
<artifactId>cucumber-clojure</artifactId>

‎core/pom.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>info.cukes</groupId>
76
<artifactId>cucumber-jvm</artifactId>
87
<relativePath>../pom.xml</relativePath>
9-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
109
</parent>
1110

1211
<artifactId>cucumber-core</artifactId>
@@ -79,8 +78,7 @@
7978
<artifactId>maven-shade-plugin</artifactId>
8079
<configuration>
8180
<transformers>
82-
<transformer
83-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
81+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
8482
<mainClass>cucumber.api.cli.Main</mainClass>
8583
</transformer>
8684
</transformers>

‎examples/groovy-calculator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>info.cukes</groupId>
66
<artifactId>cucumber-jvm</artifactId>
77
<relativePath>../../pom.xml</relativePath>
8-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
99
</parent>
1010

1111
<artifactId>groovy-calculator</artifactId>

‎examples/java-calculator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>info.cukes</groupId>
66
<artifactId>cucumber-jvm</artifactId>
77
<relativePath>../../pom.xml</relativePath>
8-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
99
</parent>
1010

1111
<artifactId>java-calculator</artifactId>

‎examples/java-webbit-websockets-selenium/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>info.cukes</groupId>
66
<artifactId>cucumber-jvm</artifactId>
77
<relativePath>../../pom.xml</relativePath>
8-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
99
</parent>
1010

1111
<artifactId>java-webbit-websockets-selenium</artifactId>

‎examples/scala-calculator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>info.cukes</groupId>
66
<artifactId>cucumber-jvm</artifactId>
77
<relativePath>../../pom.xml</relativePath>
8-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
99
</parent>
1010

1111
<artifactId>scala-calculator</artifactId>

‎examples/spring-txn/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>info.cukes</groupId>
76
<artifactId>cucumber-jvm</artifactId>
87
<relativePath>../../pom.xml</relativePath>
9-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
109
</parent>
1110

1211
<artifactId>spring-txn</artifactId>

‎groovy/pom.xml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>info.cukes</groupId>
76
<artifactId>cucumber-jvm</artifactId>
87
<relativePath>../pom.xml</relativePath>
9-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
109
</parent>
1110

1211
<artifactId>cucumber-groovy</artifactId>
@@ -101,8 +100,7 @@
101100
<phase>generate-sources</phase>
102101
<configuration>
103102
<target>
104-
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy"
105-
classpathref="maven.plugin.classpath"/>
103+
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="maven.plugin.classpath" />
106104

107105
<groovy><![CDATA[
108106
import groovy.text.SimpleTemplateEngine
@@ -128,8 +126,7 @@ I18n.all.each { i18n ->
128126
<phase>package</phase>
129127
<configuration>
130128
<target>
131-
<copy file="${project.build.directory}/${project.build.finalName}.jar"
132-
tofile="${basedir}/bin/cucumber-groovy.jar"/>
129+
<copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${basedir}/bin/cucumber-groovy.jar" />
133130
</target>
134131
</configuration>
135132
<goals>
@@ -150,18 +147,16 @@ I18n.all.each { i18n ->
150147
without cucumber-groovy-full.jar on the classpath, but that will work too.
151148
-->
152149

153-
<echo message="Running groovy tests via the CLI..."/>
154-
<java classname="groovy.ui.GroovyMain" fork="true" failonerror="true"
155-
newenvironment="true" maxmemory="512m">
150+
<echo message="Running groovy tests via the CLI..." />
151+
<java classname="groovy.ui.GroovyMain" fork="true" failonerror="true" newenvironment="true" maxmemory="512m">
156152
<classpath>
157-
<pathelement
158-
location="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}"/>
159-
<pathelement location="${maven.dependency.junit.junit.jar.path}"/>
160-
<pathelement location="${basedir}/bin/cucumber-groovy.jar"/>
161-
<pathelement location="target/test-classes"/>
153+
<pathelement location="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}" />
154+
<pathelement location="${maven.dependency.junit.junit.jar.path}" />
155+
<pathelement location="${basedir}/bin/cucumber-groovy.jar" />
156+
<pathelement location="target/test-classes" />
162157
</classpath>
163-
<arg value="bin/cucumber-jvm.groovy"/>
164-
<arg value="--strict"/>
158+
<arg value="bin/cucumber-jvm.groovy" />
159+
<arg value="--strict" />
165160

166161
<!--
167162
target/test-classes/cucumber/runtime/groovy contains:
@@ -171,10 +166,10 @@ I18n.all.each { i18n ->
171166
* feature filkes (a_feature.feature etc)
172167
173168
-->
174-
<arg value="--glue"/>
175-
<arg value="classpath:cucumber/runtime/groovy"/>
169+
<arg value="--glue" />
170+
<arg value="classpath:cucumber/runtime/groovy" />
176171

177-
<arg value="classpath:cucumber/runtime/groovy"/>
172+
<arg value="classpath:cucumber/runtime/groovy" />
178173
</java>
179174

180175
</target>

‎guice/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>info.cukes</groupId>
76
<artifactId>cucumber-jvm</artifactId>
87
<relativePath>../pom.xml</relativePath>
9-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
109
</parent>
1110

1211
<artifactId>cucumber-guice</artifactId>

‎ioke/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>info.cukes</groupId>
76
<artifactId>cucumber-jvm</artifactId>
87
<relativePath>../pom.xml</relativePath>
9-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
109
</parent>
1110

1211
<artifactId>cucumber-ioke</artifactId>

‎java/pom.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>info.cukes</groupId>
76
<artifactId>cucumber-jvm</artifactId>
87
<relativePath>../pom.xml</relativePath>
9-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
109
</parent>
1110

1211
<artifactId>cucumber-java</artifactId>
@@ -65,8 +64,7 @@
6564
<phase>generate-sources</phase>
6665
<configuration>
6766
<target>
68-
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy"
69-
classpathref="maven.plugin.classpath"/>
67+
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="maven.plugin.classpath" />
7068

7169
<groovy><![CDATA[
7270
import groovy.text.SimpleTemplateEngine

‎jruby/pom.xml

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>info.cukes</groupId>
76
<artifactId>cucumber-jvm</artifactId>
87
<relativePath>../pom.xml</relativePath>
9-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
109
</parent>
1110

1211
<artifactId>cucumber-jruby</artifactId>
@@ -91,8 +90,7 @@
9190
<phase>generate-sources</phase>
9291
<configuration>
9392
<target>
94-
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy"
95-
classpathref="maven.plugin.classpath"/>
93+
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="maven.plugin.classpath" />
9694

9795
<groovy><![CDATA[
9896
def template = """\
@@ -132,18 +130,16 @@ gherkin.I18n.all.each { i18n ->
132130
<configuration>
133131
<target>
134132
<!-- drop it in the lib directory for great justice -->
135-
<copy file="${project.build.directory}/${project.build.finalName}.jar"
136-
tofile="${basedir}/lib/cucumber-jruby.jar"/>
133+
<copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${basedir}/lib/cucumber-jruby.jar" />
137134

138135
<!-- build the gem file using jruby -->
139-
<echo message="Building Gem"/>
140-
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" failonerror="true"
141-
fork="true">
142-
<sysproperty key="cucumber-jvm.version" value="${project.version}"/>
143-
<arg value="-S"/>
144-
<arg value="gem"/>
145-
<arg value="build"/>
146-
<arg value="cucumber-jvm.gemspec"/>
136+
<echo message="Building Gem" />
137+
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" failonerror="true" fork="true">
138+
<sysproperty key="cucumber-jvm.version" value="${project.version}" />
139+
<arg value="-S" />
140+
<arg value="gem" />
141+
<arg value="build" />
142+
<arg value="cucumber-jvm.gemspec" />
147143
</java>
148144
</target>
149145
</configuration>
@@ -160,14 +156,13 @@ gherkin.I18n.all.each { i18n ->
160156
<configuration>
161157
<target>
162158
<!-- also run the CLI test to ensure that stuff works via the CLI as well -->
163-
<echo message="Running cucumber via the CLI..."/>
164-
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" fork="true"
165-
failonerror="true" newenvironment="true" maxmemory="512m">
166-
<arg value="-S"/>
167-
<arg value="bin/cucumber-jvm"/>
168-
<arg value="--glue"/>
169-
<arg value="src/test/resources"/>
170-
<arg value="src/test/resources"/>
159+
<echo message="Running cucumber via the CLI..." />
160+
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" fork="true" failonerror="true" newenvironment="true" maxmemory="512m">
161+
<arg value="-S" />
162+
<arg value="bin/cucumber-jvm" />
163+
<arg value="--glue" />
164+
<arg value="src/test/resources" />
165+
<arg value="src/test/resources" />
171166
</java>
172167
</target>
173168
</configuration>
@@ -178,28 +173,26 @@ gherkin.I18n.all.each { i18n ->
178173
<configuration>
179174
<target>
180175
<!-- install the jruby-openssl gem first! -->
181-
<echo message="installing jruby-openssl..."/>
182-
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" failonerror="true"
183-
fork="true">
184-
<arg value="-S"/>
185-
<arg value="gem"/>
186-
<arg value="install"/>
187-
<arg value="jruby-openssl"/>
188-
<arg value="--no-rdoc"/>
189-
<arg value="--no-ri"/>
190-
<arg value="-i"/>
191-
<arg value="${basedir}/target/gems"/>
176+
<echo message="installing jruby-openssl..." />
177+
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" failonerror="true" fork="true">
178+
<arg value="-S" />
179+
<arg value="gem" />
180+
<arg value="install" />
181+
<arg value="jruby-openssl" />
182+
<arg value="--no-rdoc" />
183+
<arg value="--no-ri" />
184+
<arg value="-i" />
185+
<arg value="${basedir}/target/gems" />
192186
</java>
193187

194188
<!-- publish the gem to rubygems.org -->
195-
<echo message="Publishing Gem"/>
196-
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" failonerror="true"
197-
fork="true">
198-
<env key="GEM_PATH" value="${basedir}/target/gems"/>
199-
<arg value="-S"/>
200-
<arg value="gem"/>
201-
<arg value="push"/>
202-
<arg value="cucumber-jvm-${project.parent.version}-java.gem"/>
189+
<echo message="Publishing Gem" />
190+
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" failonerror="true" fork="true">
191+
<env key="GEM_PATH" value="${basedir}/target/gems" />
192+
<arg value="-S" />
193+
<arg value="gem" />
194+
<arg value="push" />
195+
<arg value="cucumber-jvm-${project.parent.version}-java.gem" />
203196
</java>
204197
</target>
205198
</configuration>

‎junit/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43

54
<parent>
65
<groupId>info.cukes</groupId>
76
<artifactId>cucumber-jvm</artifactId>
87
<relativePath>../pom.xml</relativePath>
9-
<version>1.1.0-SNAPSHOT</version>
8+
<version>1.1.0</version>
109
</parent>
1110

1211
<artifactId>cucumber-junit</artifactId>

0 commit comments

Comments
 (0)