Modifying pom.xml files for Spark 2, Scala 2.12 release.

bigdatagenomics · Dec 15, 2019 · afbba2c · afbba2c
1 parent 61f83f4
commit afbba2c
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 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-spark2_2.11</artifactId>
+    <artifactId>adam-parent-spark2_2.12</artifactId>
     <version>0.30.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-apis-spark2_2.11</artifactId>
+  <artifactId>adam-apis-spark2_2.12</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: APIs for Java, Python</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-spark2_2.11</artifactId>
+    <artifactId>adam-parent-spark2_2.12</artifactId>
     <version>0.30.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-assembly-spark2_2.11</artifactId>
+  <artifactId>adam-assembly-spark2_2.12</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: Assembly</name>
   <build>

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-spark2_2.11</artifactId>
+    <artifactId>adam-parent-spark2_2.12</artifactId>
     <version>0.30.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-cli-spark2_2.11</artifactId>
+  <artifactId>adam-cli-spark2_2.12</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: CLI</name>
   <build>

diff --git a/adam-codegen/pom.xml b/adam-codegen/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.adam</groupId>
-    <artifactId>adam-parent-spark2_2.11</artifactId>
+    <artifactId>adam-parent-spark2_2.12</artifactId>
     <version>0.30.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-codegen-spark2_2.11</artifactId>
+  <artifactId>adam-codegen-spark2_2.12</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: Avro-to-Dataset codegen utils</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-spark2_2.11</artifactId>
+    <artifactId>adam-parent-spark2_2.12</artifactId>
     <version>0.30.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-core-spark2_2.11</artifactId>
+  <artifactId>adam-core-spark2_2.12</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: Core</name>
   <build>

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

diff --git a/adam-python/pom.xml b/adam-python/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.adam</groupId>
-    <artifactId>adam-parent-spark2_2.11</artifactId>
+    <artifactId>adam-parent-spark2_2.12</artifactId>
     <version>0.30.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-python-spark2_2.11</artifactId>
+  <artifactId>adam-python-spark2_2.12</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: Python APIs</name>
   <properties>

diff --git a/adam-r/pom.xml b/adam-r/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.adam</groupId>
-    <artifactId>adam-parent-spark2_2.11</artifactId>
+    <artifactId>adam-parent-spark2_2.12</artifactId>
     <version>0.30.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-r-spark2_2.11</artifactId>
+  <artifactId>adam-r-spark2_2.12</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: R APIs</name>
   <properties>

diff --git a/adam-shade/pom.xml b/adam-shade/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.bdgenomics.adam</groupId>
-    <artifactId>adam-parent-spark2_2.11</artifactId>
+    <artifactId>adam-parent-spark2_2.12</artifactId>
     <version>0.30.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>adam-shade-spark2_2.11</artifactId>
+  <artifactId>adam-shade-spark2_2.12</artifactId>
   <packaging>jar</packaging>
   <name>ADAM_${scala.version.prefix}: Shader workaround</name>
 

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-spark2_2.11</artifactId>
+  <artifactId>adam-parent-spark2_2.12</artifactId>
   <version>0.30.0-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.2</avro.version>
-    <scala.version>2.11.12</scala.version>
-    <scala.version.prefix>2.11</scala.version.prefix>
+    <scala.version>2.12.8</scala.version>
+    <scala.version.prefix>2.12</scala.version.prefix>
     <spark.version>2.4.4</spark.version>
     <parquet.version>1.10.1</parquet.version>
     <!-- Edit the following line to configure the Hadoop (HDFS) version. -->