Branch-per-Scala-version, fix IT.

This moves complexity out of Maven inheritance and into Git branching. The source POM is now WYSIWYG. See discussion in #12.
jsuereth · Nov 13, 2012 · 2e0e34e · 2e0e34e
1 parent 6355d65
commit 2e0e34e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 76 deletions.
diff --git a/pom-2.10.0-RC2.xml b/pom-2.10.0-RC2.xml
diff --git a/pom-2.9.xml b/pom-2.9.xml
diff --git a/parent-pom.xml → pom.xml b/parent-pom.xml → pom.xml
@@ -3,11 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <properties>
     <maven.version>3.0</maven.version>
+    <scala.version>2.9.0</scala.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <groupId>com.jsuereth</groupId>
-  <artifactId>scala-mojo-support</artifactId>
-  <packaging>pom</packaging>
+  <artifactId>scala-mojo-support_2.9</artifactId>
+  <packaging>jar</packaging>
   <version>0.5-SNAPSHOT</version>
   <name>Scala Mojo Support</name>
   <description>The scala-mojo-support project contains helper code for creating Mojos in scala.</description>
@@ -73,21 +74,17 @@
       <version>4.8.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-compiler</artifactId>
+      <version>${scala.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>${scala.version}</version>
+    </dependency>
   </dependencies>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-compiler</artifactId>
-        <version>${scala.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-library</artifactId>
-        <version>${scala.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <licenses>
     <license>
       <name>BSD</name>
@@ -132,7 +129,7 @@
         <configuration>
           <scalaVersion>${scala.version}</scalaVersion>
           <args>
-            <arg>-target:jvm-${target.jvm}</arg>
+            <arg>-target:jvm-1.5</arg>
             <arg>-no-specialization</arg>
             <arg>-deprecation</arg>
             <!--<arg>-Ystop:erasure</arg>-->

diff --git a/src/it/test-mojo-project/pom.xml b/src/it/test-mojo-project/pom.xml
@@ -8,9 +8,10 @@
 	<name>test-scala-plugin Maven Mojo</name>
 
     <properties>
-      <scala.version>2.8.0</scala.version>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+      <scala.version>2.9.0</scala.version>
+      <scala-mojo-support.artifactId>scala-mojo-support_2.9</scala-mojo-support.artifactId>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 
+   </properties>
 
 	<dependencies>
 		<dependency>
@@ -19,8 +20,8 @@
 			<version>@maven.version@</version>
 		</dependency>
 		<dependency>
-			<groupId>org.scala-tools</groupId>
-			<artifactId>scala-mojo-support</artifactId>
+			<groupId>com.jsuereth</groupId>
+			<artifactId>${scala-mojo-support.artifactId}</artifactId>
 			<version>@project.version@</version>
 		</dependency>
 		<dependency>
@@ -35,6 +36,7 @@
 			<plugin>
 				<groupId>org.scala-tools</groupId>
 				<artifactId>maven-scala-plugin</artifactId>
+				<version>2.15.2</version>
 				<executions>
 					<execution>
 						<goals>
@@ -49,8 +51,8 @@
 				<version>2.6</version>
         <dependencies>
 					<dependency>
-						<groupId>org.scala-tools</groupId>
-						<artifactId>scala-mojo-support</artifactId>
+						<groupId>com.jsuereth</groupId>
+						<artifactId>${scala-mojo-support.artifactId}</artifactId>
 						<version>@project.version@</version>
 					</dependency>
 				</dependencies>