Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: cucumber/cucumber-jvm
...
head fork: cucumber/cucumber-jvm
Checking mergeability… Don't worry, you can still create the pull request.
  • 11 commits
  • 32 files changed
  • 0 commit comments
  • 2 contributors
Showing with 395 additions and 264 deletions.
  1. +1 −0  .gitignore
  2. +6 −0 History.md
  3. +5 −5 README.md
  4. +11 −2 clojure/pom.xml
  5. +9 −20 core/pom.xml
  6. +1 −1  cucumber-tck
  7. +1 −1  examples/groovy-calculator/pom.xml
  8. +1 −1  examples/java-calculator/pom.xml
  9. +3 −6 examples/java-helloworld/build.xml
  10. +4 −4 examples/java-helloworld/pom.xml
  11. +1 −1  examples/java-webbit-websockets-selenium/pom.xml
  12. +1 −1  examples/scala-calculator/pom.xml
  13. +2 −1  groovy/bin/.gitignore
  14. +1 −1  groovy/bin/cucumber-jvm.groovy
  15. +14 −17 groovy/pom.xml
  16. +11 −1 guice/pom.xml
  17. +11 −1 ioke/pom.xml
  18. +11 −2 java/pom.xml
  19. +1 −1  jruby/bin/cucumber-jvm
  20. +1 −1  jruby/cucumber-jvm.gemspec
  21. +33 −37 jruby/pom.xml
  22. +11 −1 junit/pom.xml
  23. +2 −1  jython/bin/.gitignore
  24. +3 −4 jython/bin/cucumber-jvm.py
  25. +46 −45 jython/pom.xml
  26. +12 −12 openejb/pom.xml
  27. +11 −11 picocontainer/pom.xml
  28. +135 −80 pom.xml
  29. +11 −1 rhino/pom.xml
  30. +13 −3 scala/pom.xml
  31. +11 −1 spring/pom.xml
  32. +11 −1 weld/pom.xml
View
1  .gitignore
@@ -28,3 +28,4 @@ release.properties
ehthumbs.db
Icon?
Thumbs.db
+dependency-reduced-pom.xml
View
6 History.md
@@ -1,3 +1,9 @@
+## [1.0.14](https://github.com/cucumber/cucumber-jvm/compare/v1.0.12...v1.0.14)
+
+(The 1.0.13 release failed half way through)
+
+* [Core] gherkin.jar, gherkin-jvm-deps.jar and cucumber-jvm-deps.jar are embedded inside cucumber-core.jar (to simplify installation) (Aslak Hellesøy)
+
## [1.0.12](https://github.com/cucumber/cucumber-jvm/compare/v1.0.11...v1.0.12)
* [Core] No img data in embeddings using both json and html reports ([#339](https://github.com/cucumber/cucumber-jvm/issues/339) Aslak Hellesøy)
View
10 README.md
@@ -46,13 +46,13 @@ in your [POM](http://maven.apache.org/pom.html):
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
- <version>1.0.11</version>
+ <version>1.0.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>1.0.11</version>
+ <version>1.0.14</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -70,7 +70,7 @@ There are more jars available - add the ones you need. (TODO: A guide on how to
Add a [dependency](http://ant.apache.org/ivy/history/latest-milestone/ivyfile/dependency.html) in your [ivy.xml](http://ant.apache.org/ivy/history/latest-milestone/ivyfile.html):
```xml
- <dependency org="info.cukes" name="cucumber-core" rev="1.0.11"/>
+ <dependency org="info.cukes" name="cucumber-core" rev="1.0.14"/>
```
Since the artifacts are released to Maven Central, the default Ivy configuration should pull them down automatically.
@@ -90,7 +90,7 @@ There isn't any online documentation yet. Check out the examples, read the code
### API Docs
-* http://cukes.info/cucumber/jvm/api/1.0.11
+* http://cukes.info/cucumber/jvm/api/1.0.14
## Examples
@@ -233,7 +233,7 @@ Now release everything:
```
mvn release:clean
-mvn --batch-mode -P release-sign-artifacts release:prepare -DautoVersionSubmodules=true -DdevelopmentVersion=1.0.12-SNAPSHOT
+mvn --batch-mode -P release-sign-artifacts release:prepare -DautoVersionSubmodules=true -DdevelopmentVersion=1.0.15-SNAPSHOT
mvn -P release-sign-artifacts release:perform
```
View
13 clojure/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-clojure</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-core</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<scope>provided</scope>
@@ -44,7 +54,6 @@
<plugin>
<groupId>com.theoryinpractise</groupId>
<artifactId>clojure-maven-plugin</artifactId>
- <version>1.3.10</version>
<configuration>
<namespaces>
<namespace>cucumber.*</namespace>
View
29 core/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-core</artifactId>
@@ -15,25 +15,15 @@
<dependencies>
<dependency>
<groupId>info.cukes</groupId>
- <artifactId>cucumber-jvm-deps</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.googlecode.java-diff-utils</groupId>
- <artifactId>diffutils</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>cucumber-html</artifactId>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
- <artifactId>gherkin</artifactId>
+ <artifactId>cucumber-jvm-deps</artifactId>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
- <artifactId>cucumber-html</artifactId>
+ <artifactId>gherkin</artifactId>
</dependency>
<dependency>
@@ -79,14 +69,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
+ <artifactId>maven-shade-plugin</artifactId>
<configuration>
- <archive>
- <manifest>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>cucumber.cli.Main</mainClass>
- </manifest>
- </archive>
+ </transformer>
+ </transformers>
</configuration>
</plugin>
</plugins>
2  cucumber-tck
@@ -1 +1 @@
-Subproject commit 1288b20f464881e6428854cee6145e774b65248e
+Subproject commit 0f42d85e17c1bbfa6da76960fc40985db69e49bd
View
2  examples/groovy-calculator/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>groovy-calculator</artifactId>
View
2  examples/java-calculator/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>java-calculator</artifactId>
View
9 examples/java-helloworld/build.xml
@@ -1,8 +1,7 @@
<project name="java-helloworld" basedir="." default="runcukes">
<property name="repo" value="https://oss.sonatype.org/content/repositories/releases"/>
- <property name="cucumber-jvm.version" value="1.0.12"/>
+ <property name="cucumber-jvm.version" value="1.0.14"/>
<property name="cucumber-html.version" value="0.2.1"/>
- <property name="gherkin.version" value="2.11.2"/>
<property name="jchronic.version" value="0.2.6"/>
<property name="junit.version" value="4.10"/>
@@ -12,14 +11,12 @@
<mkdir dir="${jars}"/>
<get src="${repo}/info/cukes/cucumber-core/${cucumber-jvm.version}/cucumber-core-${cucumber-jvm.version}.jar"
dest="${jars}/cucumber-core-${cucumber-jvm.version}.jar"/>
- <get src="${repo}/info/cukes/cucumber-html/${cucumber-html.version}/cucumber-html-${cucumber-html.version}.jar"
- dest="${jars}/cucumber-html-${cucumber-html.version}.jar"/>
<get src="${repo}/info/cukes/cucumber-java/${cucumber-jvm.version}/cucumber-java-${cucumber-jvm.version}.jar"
dest="${jars}/cucumber-java-${cucumber-jvm.version}.jar"/>
+ <get src="${repo}/info/cukes/cucumber-html/${cucumber-html.version}/cucumber-html-${cucumber-html.version}.jar"
+ dest="${jars}/cucumber-html-${cucumber-html.version}.jar"/>
<get src="${repo}/info/cukes/cucumber-junit/${cucumber-jvm.version}/cucumber-junit-${cucumber-jvm.version}.jar"
dest="${jars}/cucumber-junit-${cucumber-jvm.version}.jar"/>
- <get src="${repo}/info/cukes/gherkin/${gherkin.version}/gherkin-${gherkin.version}.jar"
- dest="${jars}/gherkin-${gherkin.version}.jar"/>
<get src="${repo}/com/rubiconproject/oss/jchronic/${jchronic.version}/jchronic-${jchronic.version}.jar"
dest="${jars}/jchronic-${jchronic.version}.jar"/>
<get src="${repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"
View
8 examples/java-helloworld/pom.xml
@@ -4,7 +4,7 @@
<groupId>info.cukes</groupId>
<artifactId>java-helloworld</artifactId>
- <version>1.0.12</version>
+ <version>1.0.14</version>
<packaging>jar</packaging>
<name>Examples: Java Hello World</name>
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.5.1</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
@@ -27,13 +27,13 @@
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
- <version>1.0.12</version>
+ <version>1.0.14</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>1.0.12</version>
+ <version>1.0.14</version>
<scope>test</scope>
</dependency>
<dependency>
View
2  examples/java-webbit-websockets-selenium/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>java-webbit-websockets-selenium</artifactId>
View
2  examples/scala-calculator/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>scala-calculator</artifactId>
View
3  groovy/bin/.gitignore
@@ -1 +1,2 @@
-cucumber-groovy-full.jar
+cucumber-groovy.jar
+
View
2  groovy/bin/cucumber-jvm.groovy
@@ -1,3 +1,3 @@
scriptDir = new File(getClass().protectionDomain.codeSource.location.path).getParent();
-if (this.class.classLoader.rootLoader) this.class.classLoader.rootLoader.addURL(new File(scriptDir, "cucumber-groovy-full.jar").toURL())
+if (this.class.classLoader.rootLoader) this.class.classLoader.rootLoader.addURL(new File(scriptDir, "cucumber-groovy.jar").toURL())
this.class.classLoader.loadClass("cucumber.cli.Main").main(args)
View
31 groovy/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-groovy</artifactId>
@@ -22,6 +22,16 @@
<artifactId>cucumber-core</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<scope>provided</scope>
@@ -49,7 +59,6 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<goals>
@@ -62,8 +71,8 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
<configuration>
<filesets>
<fileset>
@@ -78,17 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>package-full</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -127,7 +126,7 @@ I18n.all.each { i18n ->
<phase>package</phase>
<configuration>
<target>
- <copy file="${project.build.directory}/${project.build.finalName}-full.jar" tofile="${basedir}/bin/cucumber-groovy-full.jar" />
+ <copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${basedir}/bin/cucumber-groovy.jar" />
</target>
</configuration>
<goals>
@@ -153,7 +152,7 @@ I18n.all.each { i18n ->
<classpath>
<pathelement location="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}" />
<pathelement location="${maven.dependency.junit.junit.jar.path}" />
- <pathelement location="${basedir}/bin/cucumber-groovy-full.jar" />
+ <pathelement location="${basedir}/bin/cucumber-groovy.jar" />
<pathelement location="target/test-classes" />
</classpath>
<arg value="bin/cucumber-jvm.groovy" />
@@ -181,7 +180,6 @@ I18n.all.each { i18n ->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>add-source</id>
@@ -201,7 +199,6 @@ I18n.all.each { i18n ->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.11</version>
<configuration>
<includes>
<include>**/*.java</include>
View
12 guice/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-guice</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-java</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<scope>provided</scope>
View
12 ioke/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-ioke</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-core</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.ioke</groupId>
<artifactId>ioke-lang-lib</artifactId>
<scope>provided</scope>
View
13 java/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-java</artifactId>
@@ -17,6 +17,16 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>info.cukes</groupId>
@@ -82,7 +92,6 @@ I18n.all.each { i18n ->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>add-source</id>
View
2  jruby/bin/cucumber-jvm
@@ -1,7 +1,7 @@
#!/usr/bin/env jruby
$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
-require 'cucumber-jruby-full.jar'
+require 'cucumber-jruby.jar'
begin
Java::CucumberCli::Main.main(ARGV)
View
2  jruby/cucumber-jvm.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.summary = "#{s.name}-#{s.version}"
s.email = 'cukes@googlegroups.com'
s.homepage = 'http://github.com/cucumber/cucumber-jvm'
- s.files = ['bin/cucumber-jvm', 'lib/cucumber-jruby-full.jar']
+ s.files = ['bin/cucumber-jvm', 'lib/cucumber-jruby.jar']
s.executables = ['cucumber-jvm']
s.require_path = 'lib'
s.platform = 'java'
View
70 jruby/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-jruby</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-core</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<scope>provided</scope>
@@ -43,8 +53,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
<configuration>
<filesets>
<fileset>
@@ -66,50 +76,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.7.1</version>
- <executions>
- <execution>
- <id>package-full</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
- <id>jruby-cli-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <!-- also run the CLI test to ensure that stuff works via the CLI as well -->
- <echo message="Running cucumber via the CLI..." />
- <java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" fork="true" failonerror="true" newenvironment="true" maxmemory="512m">
- <arg value="-S" />
- <arg value="bin/cucumber-jvm" />
- <arg value="--glue" />
- <arg value="src/test/resources" />
- <arg value="src/test/resources" />
- </java>
- </target>
- </configuration>
- </execution>
- <execution>
<id>package-gem</id>
<phase>package</phase>
<configuration>
<target>
<!-- drop it in the lib directory for great justice -->
- <copy file="${project.build.directory}/${project.build.finalName}-full.jar" tofile="${basedir}/lib/cucumber-jruby-full.jar" />
+ <copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${basedir}/lib/cucumber-jruby.jar" />
<!-- build the gem file using jruby -->
<echo message="Building Gem" />
@@ -127,11 +106,30 @@
</goals>
</execution>
<execution>
+ <id>jruby-cli-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- also run the CLI test to ensure that stuff works via the CLI as well -->
+ <echo message="Running cucumber via the CLI..." />
+ <java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" fork="true" failonerror="true" newenvironment="true" maxmemory="512m">
+ <arg value="-S" />
+ <arg value="bin/cucumber-jvm" />
+ <arg value="--glue" />
+ <arg value="src/test/resources" />
+ <arg value="src/test/resources" />
+ </java>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
<id>deploy-gem</id>
<phase>deploy</phase>
<configuration>
<target>
-
<!-- install the jruby-openssl gem first! -->
<echo message="installing jruby-openssl..." />
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" failonerror="true" fork="true">
@@ -145,7 +143,6 @@
<arg value="${basedir}/target/gems" />
</java>
-
<!-- publish the gem to rubygems.org -->
<echo message="Publishing Gem" />
<java jar="${maven.dependency.org.jruby.jruby-complete.jar.path}" failonerror="true" fork="true">
@@ -161,7 +158,6 @@
<goal>run</goal>
</goals>
</execution>
-
</executions>
</plugin>
</plugins>
View
12 junit/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-junit</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-core</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
View
3  jython/bin/.gitignore
@@ -1 +1,2 @@
-cucumber-jython-full.jar
+cucumber-jython.jar
+
View
7 jython/bin/cucumber-jvm.py
@@ -1,8 +1,8 @@
#!/usr/bin/env jython
import sys, inspect, os
-jar_path = os.path.dirname(inspect.getfile(inspect.currentframe())) + "/cucumber-jython-full.jar"
-sys.path.append(jar_path)
+cucumber_jython_path = os.path.dirname(inspect.getfile(inspect.currentframe())) + "/cucumber-jython.jar"
+sys.path.append(cucumber_jython_path)
from java.io import File
from java.net import URLClassLoader
@@ -10,8 +10,7 @@
from cucumber.runtime import Runtime
from cucumber.runtime.jython import JythonBackend
-url = File(jar_path).toURL()
-cl = URLClassLoader([url], Main.getClassLoader())
+cl = URLClassLoader([File(cucumber_jython_path).toURL()], Main.getClassLoader())
def createRuntime(resourceLoader, gluePaths, classLoader, dryRun):
# TODO - pass in current jython runtime - PythonInterpreter
View
91 jython/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-jython</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-core</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
<scope>provided</scope>
@@ -48,8 +58,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
<configuration>
<filesets>
<fileset>
@@ -61,18 +71,10 @@
</filesets>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>package-full</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -80,39 +82,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>jruby-cli-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <!-- also run the CLI test to ensure that stuff works via the CLI as well -->
- <echo message="Running jython tests via the CLI..." />
- <java jar="${maven.dependency.org.python.jython-standalone.jar.path}" fork="true" failonerror="true" newenvironment="true" maxmemory="512m">
- <arg value="-S" />
- <arg value="bin/cucumber-jvm.py" />
- <arg value="--glue" />
- <arg value="src/test/resources" />
- <arg value="src/test/resources" />
- </java>
- </target>
- </configuration>
- </execution>
- <execution>
- <id>package-gem</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <target>
- <!-- drop it in the lib directory for great justice -->
- <copy file="${project.build.directory}/${project.build.finalName}-full.jar" tofile="${basedir}/bin/cucumber-jython-full.jar" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
<id>generate-i18n-resources</id>
<goals>
<goal>run</goal>
@@ -143,12 +112,44 @@ I18n.all.each { i18n ->
</target>
</configuration>
</execution>
+ <execution>
+ <id>package-egg</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <copy file="${project.build.directory}/${project.build.finalName}.jar" tofile="${basedir}/bin/cucumber-jython.jar" />
+ <!-- todo: make an egg -->
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>jython-cli-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <!-- also run the CLI test to ensure that stuff works via the CLI as well -->
+ <echo message="Running jython tests via the CLI..." />
+ <java jar="${maven.dependency.org.python.jython-standalone.jar.path}" fork="true" failonerror="true" newenvironment="true" maxmemory="512m">
+ <arg value="-S" />
+ <arg value="bin/cucumber-jvm.py" />
+ <arg value="--glue" />
+ <arg value="src/test/resources" />
+ <arg value="src/test/resources" />
+ </java>
+ </target>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>add-resource</id>
View
24 openejb/pom.xml
@@ -5,32 +5,32 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-openejb</artifactId>
<packaging>jar</packaging>
<name>Cucumber-JVM: OpenEJB</name>
- <repositories>
- <repository>
- <id>apache-snapshot-repo</id>
- <name>Apache snpashot repo</name>
- <url>https://repository.apache.org/content/groups/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
View
22 picocontainer/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-picocontainer</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-java</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer</artifactId>
<scope>compile</scope>
@@ -45,17 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>package-full</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
View
215 pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
- <version>1.0.12</version>
+ <version>1.0.14</version>
<packaging>pom</packaging>
<name>Cucumber-JVM</name>
<url>http://cukes.info/</url>
@@ -30,19 +30,36 @@
<connection>scm:git:git://github.com/cucumber/cucumber-jvm.git</connection>
<developerConnection>scm:git:git@github.com:cucumber/cucumber-jvm.git</developerConnection>
<url>git://github.com/cucumber/cucumber-jvm.git</url>
- </scm>
+ <tag>v1.0.14</tag>
+ </scm>
<distributionManagement>
<site>
<id>cukes.info</id>
<url>scp://cukes.info/var/www/cucumber_site/cucumber/jvm/api/${project.version}</url>
</site>
</distributionManagement>
+
<dependencyManagement>
<dependencies>
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm-deps</artifactId>
<version>1.0.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.googlecode.java-diff-utils</groupId>
+ <artifactId>diffutils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <version>${gherkin.version}</version>
</dependency>
<dependency>
<groupId>info.cukes</groupId>
@@ -203,10 +220,6 @@
<repositories>
<repository>
- <id>cucumber-jvm-deps</id>
- <url>file://${basedir}/../deps/repository</url>
- </repository>
- <repository>
<id>codehaus</id>
<url>http://repository.codehaus.org</url>
</repository>
@@ -275,7 +288,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.2.2</version>
<configuration>
<tagNameFormat>v@{project.version}</tagNameFormat>
</configuration>
@@ -284,7 +296,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
<configuration>
<useAgent>true</useAgent>
</configuration>
@@ -306,8 +317,9 @@
<build>
<pluginManagement>
- <!-- To define the plugin version in your parent POM -->
<plugins>
+ <!-- Standard plugins - alphabetically -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -325,89 +337,132 @@
</dependency>
</dependencies>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>.</directory>
+ <includes>
+ <include>**/*.ser</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.5</version>
+ <version>1.7.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>bind-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12.2</version>
<configuration>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <shadedClassifierName>full</shadedClassifierName>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>cucumber.cli.Main</mainClass>
- </transformer>
- </transformers>
+ <argLine>-Duser.language=en</argLine>
+ <argLine>-Xmx1024m</argLine>
+ <argLine>-XX:MaxPermSize=256m</argLine>
+ <useFile>false</useFile>
</configuration>
</plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
+ <!-- Non-standard plugins - alphabetically -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- <executions>
- <execution>
- <id>bind-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <argLine>-Duser.language=en</argLine>
- <argLine>-Xmx1024m</argLine>
- <argLine>-XX:MaxPermSize=256m</argLine>
- <useFile>false</useFile>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>.</directory>
- <includes>
- <include>**/*.ser</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
- </plugin>
+ <plugin>
+ <groupId>com.theoryinpractise</groupId>
+ <artifactId>clojure-maven-plugin</artifactId>
+ <version>1.3.11</version>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
- </plugin>
- </plugins>
+ </plugins>
+ </pluginManagement>
<extensions>
<extension>
View
12 rhino/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-rhino</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-core</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
<scope>provided</scope>
View
16 scala/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-scala</artifactId>
@@ -18,15 +18,26 @@
<artifactId>cucumber-core</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-junit</artifactId>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
@@ -49,7 +60,6 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
- <version>3.0.1</version>
<configuration>
<!--encoding>UTF-8</encoding-->
<excludes>
View
12 spring/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-spring</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-java</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<scope>provided</scope>
View
12 weld/pom.xml
@@ -5,7 +5,7 @@
<groupId>info.cukes</groupId>
<artifactId>cucumber-jvm</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.12</version>
+ <version>1.0.14</version>
</parent>
<artifactId>cucumber-weld</artifactId>
@@ -18,6 +18,16 @@
<artifactId>cucumber-java</artifactId>
</dependency>
<dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-jvm-deps</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>gherkin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>

No commit comments for this range

Something went wrong with that request. Please try again.