Scala tweaks. Closes #432, #462.

Author: aslakhellesoy

History.md

@@ -3,6 +3,7 @@
 * [Core] Bugfix: Generated regex for ? character is incorrect. ([#494](https://github.com/cucumber/cucumber-jvm/issues/494) Aslak Hellesøy)
 * [Core] Improve readability with unanchored regular expressions ([#485](https://github.com/cucumber/cucumber-jvm/pull/485), [#466](https://github.com/cucumber/cucumber-jvm/issues/466) Anton)
 * [Core] Throw exception when unsupported command line options are used. ([#482](https://github.com/cucumber/cucumber-jvm/pull/482), [#463](https://github.com/cucumber/cucumber-jvm/issues/463) Klaus Bayrhammer)
+* [Scala] Release cucumber-scala for the two most recent minro releases (currently 2.9.2 and 2.9.0) ([#432](https://github.com/cucumber/cucumber-jvm/issues/432), [#462](https://github.com/cucumber/cucumber-jvm/pull/462) Chris Turner)
 
 ## [1.1.3](https://github.com/cucumber/cucumber-jvm/compare/v1.1.2...v1.1.3) (2013-03-10)
 

pom.xml

@@ -19,6 +19,11 @@
         <outputDirectory>${project.build.directory}</outputDirectory>
         <gherkin.version>2.11.8</gherkin.version>
         <groovy.version>2.1.2</groovy.version>
+        <!-- Keep in sync with scala/pom.xml and scala/scala_previous/pom.xml if minor versions are bumped. -->
+        <scala.current.version>2.10.0</scala.current.version>
+        <scala.previous.version>2.9.2</scala.previous.version>
+        <!-- There is 3.1.3, but it requires at least mvn 3.0.4 which might still not be widely used. -->
+        <scala-maven-plugin.version>3.1.0</scala-maven-plugin.version>
         <spring.version>3.2.2.RELEASE</spring.version>
         <spring.data.version>1.3.0.RELEASE</spring.data.version>
         <hibernate.version>4.2.0.Final</hibernate.version>
@@ -118,7 +123,7 @@
             </dependency>
             <dependency>
                 <groupId>info.cukes</groupId>
-                <artifactId>cucumber-scala_2.9.2</artifactId>
+                <artifactId>cucumber-scala_2.9</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

scala/pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-compiler</artifactId>
-            <version>2.10.0</version>
+            <version>${scala.current.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.10.0</version>
+            <version>${scala.current.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>${scala-maven-plugin.version}</version>
                 <configuration>
                     <!--encoding>UTF-8</encoding-->
                     <excludes>

scala/scala_previous/pom.xml

@@ -8,9 +8,9 @@
         <version>1.1.4-SNAPSHOT</version>
     </parent>
 
-    <artifactId>cucumber-scala_2.9.2</artifactId>
+    <artifactId>cucumber-scala_2.9</artifactId>
     <packaging>jar</packaging>
-    <name>Cucumber-JVM: Scala (2.9.2)</name>
+    <name>Cucumber-JVM: Scala (2.9)</name>
 
     <dependencies>
         <dependency>
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-compiler</artifactId>
-            <version>2.9.2</version>
+            <version>${scala.previous.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.9.2</version>
+            <version>${scala.previous.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -70,7 +70,7 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>${scala-maven-plugin.version}</version>
                 <configuration>
                     <!--encoding>UTF-8</encoding-->
                     <excludes>