Release 1.0.0.RC4

cucumber · Jan 16, 2012 · 5709ae5 · 5709ae5
1 parent d8c6b73
commit 5709ae5
Show file tree

Hide file tree

Showing 27 changed files with 89 additions and 55 deletions.
diff --git a/History.md b/History.md
@@ -0,0 +1,9 @@
+## 1.0.0.RC4
+
+* [ALL] Fixed transitive dependencies in POM files ([#140](https://github.com/cucumber/cucumber-jvm/issues/140))
+* [ALL] Use a dot (not a hyphen) in RC version names. Required for JRuby gem.
+* [ALL] Started tagging repo after release.
+
+## 1.0.0-RC3
+
+* First proper release
diff --git a/build-common.xml b/build-common.xml
@@ -149,7 +149,7 @@
     </target>
 
     <target name="publish-local" depends="jar,test">
-        <ivy:publish resolver="local" pubrevision="${cucumber-jvm-version}" update="true" overwrite="true"
+        <ivy:publish resolver="local" pubrevision="${cucumber-jvm.version}" update="true" overwrite="true"
                      conf="default">
             <artifacts pattern="target/artifacts/jars/[artifact].[ext]"/>
         </ivy:publish>
@@ -158,15 +158,18 @@
     <target name="publish-artifacts" depends="test,publish-local"/>
 
     <target name="makepom" depends="-init-ivy" description="Generate POM">
-        <!--ivy:deliver deliverpattern="ivy.xml" pubrevision="${cucumber-jvm-version}" status="release"/-->
-        <ivy:makepom ivyfile="ivy.xml" pomfile="${module-pom}" templatefile="${common-basedir}/template.pom" artifactName="${module}"/>
+        <!--ivy:deliver deliverpattern="ivy.xml" pubrevision="${cucumber-jvm.version}" status="release"/-->
+        <ivy:makepom ivyfile="ivy.xml" pomfile="${module-pom}" templatefile="${common-basedir}/template.pom" artifactName="${module}">
+          <mapping conf="default" scope="compile"/>
+          <mapping conf="test" scope="test"/>
+        </ivy:makepom>
     </target>
 
     <target name="publish-nexus" depends="packages,jar-sources,jar-javadoc,makepom,do-publish-nexus" description="Upload to Nexus"/>
 
     <target name="do-publish-nexus" depends="-init-ivy" description="Upload to Nexus">
         <ivy:settings id="upload.settingsId" file="${common-basedir}/ivy-settings-release.xml"/>
-        <ivy:publish resolver="nexus" pubrevision="${cucumber-jvm-version}" overwrite="true" publishivy="false"
+        <ivy:publish resolver="nexus" pubrevision="${cucumber-jvm.version}" overwrite="true" publishivy="false"
                      artifactspattern="target/artifacts/[type]s/[artifact](-[classifier]).[ext]" settingsRef="upload.settingsId">
             <artifact name="${module}" ext="pom" type="pom"/>
             <artifact name="${module}" ext="jar" type="jar" classifier="sources"/>

diff --git a/build.properties b/build.properties
@@ -1,2 +1,2 @@
-cucumber-jvm-version=1.0.0.RC4
+cucumber-jvm-version=1.0.0.RC3
 gherkin.version=2.7.3
diff --git a/clojure/ivy.xml b/clojure/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-clojure" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-clojure" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -11,10 +11,10 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-core" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-core" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="clojure" org="org.clojure" rev="1.4.0-alpha3" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
     </dependencies>
 </ivy-module>
diff --git a/core/build.xml b/core/build.xml
@@ -1,3 +1,7 @@
 <project name="cucumber-core" default="test">
   <import file="../build-common.xml" />
+
+    <target name="generate" description="Generate sources">
+        <echo file="src/main/resources/cucumber/version.properties">cucumber-jvm.version=${cucumber-jvm.version}</echo>
+    </target>
 </project>
diff --git a/core/cucumber-core.iml b/core/cucumber-core.iml
@@ -21,6 +21,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/core/ivy.xml b/core/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-core" revision="${cucumber-jvm-version}" status="release" publication="20120112221234"/>
+    <info organisation="info.cukes" module="cucumber-core" revision="${cucumber-jvm.version}" status="release" publication="20120112221234"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>

diff --git a/core/src/main/java/cucumber/cli/Main.java b/core/src/main/java/cucumber/cli/Main.java
@@ -12,12 +12,13 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ResourceBundle;
 
 import static java.util.Arrays.asList;
 
 public class Main {
-    private static final String USAGE = "HELP";
-    private static final String VERSION = "1.0.0"; // TODO: get this from a file
+    private static final String USAGE = "TODO - Write the help";
+    static final String VERSION = ResourceBundle.getBundle("cucumber.version").getString("cucumber-jvm.version");
 
     public static void main(String[] argv) throws Throwable {
         List<String> featurePaths = new ArrayList<String>();

diff --git a/core/src/main/resources/cucumber/version.properties b/core/src/main/resources/cucumber/version.properties
@@ -0,0 +1 @@
+cucumber-jvm.version=1.0.0.RC4
diff --git a/core/src/test/java/cucumber/cli/MainTest.java b/core/src/test/java/cucumber/cli/MainTest.java
@@ -0,0 +1,13 @@
+package cucumber.cli;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class MainTest {
+    @Test
+    public void has_version_from_properties_file() {
+        assertEquals("1.0.0.RC4", Main.VERSION);
+    }
+
+}
diff --git a/core/src/test/java/cucumber/io/ResourceLoaderTest.java b/core/src/test/java/cucumber/io/ResourceLoaderTest.java
@@ -28,7 +28,7 @@ public void loads_resource_from_filesystem_file() {
     @Test
     public void loads_resources_from_jar_on_classpath() throws IOException {
         Iterable<Resource> files = new ClasspathResourceLoader().resources("cucumber", ".properties");
-        assertEquals(3, toList(files).size());
+        assertEquals(4, toList(files).size());
     }
 
     private <T> List<T> toList(Iterable<T> it) {

diff --git a/groovy/ivy.xml b/groovy/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-groovy" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-groovy" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -16,10 +16,10 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-core" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-core" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="groovy-all" org="org.codehaus.groovy" rev="2.0.0-beta-2" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
 
         <dependency name="jarjar" org="com.googlecode.jarjar" rev="1.1" conf="build"/>

diff --git a/guice/ivy.xml b/guice/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-guice" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-guice" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -11,10 +11,10 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-java" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-java" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="guice" org="com.google.inject" rev="3.0" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
     </dependencies>
 </ivy-module>
diff --git a/ioke/ivy.xml b/ioke/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-ioke" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-ioke" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -11,11 +11,11 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-core" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-core" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="ioke-lang" org="org.ioke" rev="P-0.4.0-p11" conf="default"/>
         <dependency name="ioke-lang-lib" org="org.ioke" rev="P-0.4.0-p11" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
     </dependencies>
 </ivy-module>
diff --git a/java/ivy.xml b/java/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-java" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-java" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -12,9 +12,9 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-core" conf="default" rev="${cucumber-jvm-version}"/>
+        <dependency name="cucumber-core" conf="default" rev="${cucumber-jvm.version}"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
 
         <dependency name="groovy-all" org="org.codehaus.groovy" rev="2.0.0-beta-2" conf="build"/>

diff --git a/java/src/test/resources/cucumber-tck/cucumber_java_mappings.rb b/java/src/test/resources/cucumber-tck/cucumber_java_mappings.rb
@@ -30,7 +30,7 @@ def write_build_files
 
     write_file('ivy.xml', <<-EOF)
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-tck" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-tck" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -42,9 +42,9 @@ def write_build_files
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-picocontainer" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-picocontainer" rev="${cucumber-jvm.version}" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
     </dependencies>
 </ivy-module>
 EOF

diff --git a/jruby/build.xml b/jruby/build.xml
@@ -41,7 +41,7 @@
         <exec executable="${env.JRUBY_HOME}/bin/jruby">
             <arg file="${env.JRUBY_HOME}/bin/gem"/>
             <arg value="push"/>
-            <arg file="cucumber-jvm-${cucumber-jvm-version}-java.gem"/>
+            <arg file="cucumber-jvm-${cucumber-jvm.version}-java.gem"/>
         </exec>
     </target>
 

diff --git a/jruby/cucumber-jvm.gemspec b/jruby/cucumber-jvm.gemspec
@@ -1,8 +1,10 @@
 # -*- encoding: utf-8 -*-
 
+version = IO.read(File.dirname(__FILE__) + '/../build.properties').match(/^\s*cucumber-jvm\.version\s*=\s*(.*)$/n)[1].strip
+
 Gem::Specification.new do |s|
   s.name         = 'cucumber-jvm'
-  s.version      = '1.0.0.RC3'
+  s.version      = "#{version}"
   s.authors      = ['Aslak Hellesøy']
   s.description  = 'Cucumber-JVM for JRuby'
   s.summary      = "#{s.name}-#{s.version}"

diff --git a/jruby/ivy.xml b/jruby/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-jruby" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-jruby" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -12,10 +12,10 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-core" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-core" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="jruby-complete" org="org.jruby" rev="1.6.5.1" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
 
         <dependency name="jarjar" org="com.googlecode.jarjar" rev="1.1" conf="build"/>

diff --git a/junit/ivy.xml b/junit/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-junit" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-junit" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -11,7 +11,7 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-core" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-core" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="junit" org="junit" rev="4.10" conf="default"/>
 
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>

diff --git a/jython/ivy.xml b/jython/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-jython" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-jython" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -11,10 +11,10 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-core" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-core" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="jython-standalone" org="org.python" rev="2.5.2" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
     </dependencies>
 </ivy-module>
diff --git a/openejb/ivy.xml b/openejb/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-openejb" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-openejb" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -11,10 +11,10 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-java" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-java" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="openejb-core" org="org.apache.openejb" rev="4.0.0-beta-2-SNAPSHOT" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
     </dependencies>
 </ivy-module>
diff --git a/picocontainer/ivy.xml b/picocontainer/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-picocontainer" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-picocontainer" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -11,10 +11,10 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-java" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-java" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="picocontainer" org="org.picocontainer" rev="2.14.1" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
     </dependencies>
 </ivy-module>
diff --git a/rhino/ivy.xml b/rhino/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-rhino" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-rhino" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -11,10 +11,10 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-core" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-core" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="js" org="rhino" rev="1.7R2" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
     </dependencies>
 </ivy-module>
diff --git a/scala/ivy.xml b/scala/ivy.xml
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-    <info organisation="info.cukes" module="cucumber-scala" revision="${cucumber-jvm-version}"/>
+    <info organisation="info.cukes" module="cucumber-scala" revision="${cucumber-jvm.version}"/>
 
     <configurations defaultconfmapping="*->default">
         <conf name="default"/>
@@ -12,11 +12,11 @@
     </publications>
 
     <dependencies>
-        <dependency name="cucumber-core" rev="${cucumber-jvm-version}" conf="default"/>
+        <dependency name="cucumber-core" rev="${cucumber-jvm.version}" conf="default"/>
         <dependency name="scala-library" org="org.scala-lang" rev="2.9.1" conf="default"/>
         <dependency name="scala-compiler" org="org.scala-lang" rev="2.9.1" conf="default"/>
 
-        <dependency name="cucumber-junit" rev="${cucumber-jvm-version}" conf="test"/>
+        <dependency name="cucumber-junit" rev="${cucumber-jvm.version}" conf="test"/>
         <dependency name="mockito-all" org="org.mockito" rev="1.9.0" conf="test"/>
         <dependency name="groovy-all" org="org.codehaus.groovy" rev="2.0.0-beta-2" conf="build"/>
     </dependencies>