Modifying pom.xml files for Spark 1, Scala 2.11 release.

bigdatagenomics · Apr 3, 2017 · d2e3509 · d2e3509
1 parent 9613a4b
commit d2e3509
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/adam-apis/pom.xml b/adam-apis/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.adam</groupId>
-    <artifactId>adam-parent_2.10</artifactId>
+    <artifactId>adam-parent_2.11</artifactId>
     <version>0.21.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-apis_2.10</artifactId>
+  <artifactId>adam-apis_2.11</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: APIs for Java</name>
   <build>

diff --git a/adam-assembly/pom.xml b/adam-assembly/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.adam</groupId>
-    <artifactId>adam-parent_2.10</artifactId>
+    <artifactId>adam-parent_2.11</artifactId>
     <version>0.21.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-assembly_2.10</artifactId>
+  <artifactId>adam-assembly_2.11</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: Assembly</name>
   <properties>

diff --git a/adam-cli/pom.xml b/adam-cli/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.adam</groupId>
-    <artifactId>adam-parent_2.10</artifactId>
+    <artifactId>adam-parent_2.11</artifactId>
     <version>0.21.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-cli_2.10</artifactId>
+  <artifactId>adam-cli_2.11</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: CLI</name>
   <properties>

diff --git a/adam-core/pom.xml b/adam-core/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.adam</groupId>
-    <artifactId>adam-parent_2.10</artifactId>
+    <artifactId>adam-parent_2.11</artifactId>
     <version>0.21.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-core_2.10</artifactId>
+  <artifactId>adam-core_2.11</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: Core</name>
   <build>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.adam</groupId>
-    <artifactId>adam-parent_2.10</artifactId>
+    <artifactId>adam-parent_2.11</artifactId>
     <version>0.21.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-distribution_2.10</artifactId>
+  <artifactId>adam-distribution_2.11</artifactId>
   <packaging>pom</packaging>
   <name>ADAM_${scala.version.prefix}: Distribution</name>
   <build>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bdgenomics.adam</groupId>
-  <artifactId>adam-parent_2.10</artifactId>
+  <artifactId>adam-parent_2.11</artifactId>
   <version>0.21.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ADAM_${scala.version.prefix}</name>
@@ -19,8 +19,8 @@
   <properties>
     <java.version>1.8</java.version>
     <avro.version>1.8.0</avro.version>
-    <scala.version>2.10.6</scala.version>
-    <scala.version.prefix>2.10</scala.version.prefix>
+    <scala.version>2.11.8</scala.version>
+    <scala.version.prefix>2.11</scala.version.prefix>
     <spark.version>1.6.3</spark.version>
     <parquet.version>1.8.1</parquet.version>
     <!-- Edit the following line to configure the Hadoop (HDFS) version. -->
@@ -476,7 +476,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.parquet</groupId>
-        <!-- This library has no Scala 2.11 version, but using the 2.10 version seems to work. -->
+        <!-- This library has no Scala 2.11 version, but using the 2.11 version seems to work. -->
         <artifactId>parquet-scala_2.10</artifactId>
         <version>${parquet.version}</version>
         <exclusions>