[ADAM-536] Add support for scala 2.11

bigdatagenomics · Jan 22, 2015 · d0821c7 · d0821c7
1 parent 8500f5a
commit d0821c7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/adam-apis/pom.xml b/adam-apis/pom.xml
@@ -8,7 +8,7 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-apis</artifactId>
+  <artifactId>adam-apis_${scala.artifact.suffix}</artifactId>
   <packaging>jar</packaging>
   <name>ADAM: APIs for Java</name>
   <build>

diff --git a/adam-cli/pom.xml b/adam-cli/pom.xml
@@ -8,7 +8,7 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-cli</artifactId>
+  <artifactId>adam-cli_${scala.artifact.suffix}</artifactId>
   <packaging>jar</packaging>
   <name>ADAM: CLI</name>
   <build>

diff --git a/adam-core/pom.xml b/adam-core/pom.xml
@@ -7,7 +7,7 @@
     <version>0.15.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>adam-core</artifactId>
+  <artifactId>adam-core_${scala.artifact.suffix}</artifactId>
   <packaging>jar</packaging>
   <name>ADAM: Core</name>
   <build>

diff --git a/pom.xml b/pom.xml
@@ -95,7 +95,7 @@
         <plugin>
           <groupId>net.alchim31.maven</groupId>
           <artifactId>scala-maven-plugin</artifactId>
-          <version>3.1.5</version>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.avro</groupId>
@@ -352,6 +352,10 @@
         <version>${hadoop.version}</version>
         <scope>provided</scope>
         <exclusions>
+          <exclusion>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+          </exclusion>
           <exclusion>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
@@ -482,6 +486,13 @@
   </dependencyManagement>
 
   <profiles>
+    <profile>
+      <id>scala-2.11</id>
+      <properties>
+        <scala.version>2.11.2</scala.version>
+        <scala.artifact.suffix>2.11</scala.artifact.suffix>
+      </properties>
+    </profile>
     <profile>
       <id>distribution</id>
       <modules>

diff --git a/scripts/release/release.sh b/scripts/release/release.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
 
 mvn -P distribution -Dresume=false release:clean release:prepare release:perform
+
+mvn -P distribution,scala-2.11 -Dresume=false release:clean release:prepare release:perform
diff --git a/scripts/release/rollback.sh b/scripts/release/rollback.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
 
 mvn -P distribution release:rollback
+
+mvn -P distribution,scala-2.11 release:rollback