Skip to content

Commit

Permalink
Modifying pom.xml files for Spark 3, Scala 2.12 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
@heuermh
heuermh committed Jul 13, 2020
1 parent d902e3e commit 624227b
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 52 deletions.
10 changes: 5 additions & 5 deletions adam-apis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-apis-spark2_2.11</artifactId>
<artifactId>adam-apis-spark3_2.12</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: APIs for Java, Python</name>
<build>
Expand Down Expand Up @@ -107,7 +107,7 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark3_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand All @@ -118,12 +118,12 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark3_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions adam-assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-assembly-spark2_2.11</artifactId>
<artifactId>adam-assembly-spark3_2.12</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: Assembly</name>
<build>
Expand Down Expand Up @@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-shade-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-shade-spark3_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down Expand Up @@ -123,7 +123,7 @@
<dependencies>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-cli-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-cli-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
20 changes: 10 additions & 10 deletions adam-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-cli-spark2_2.11</artifactId>
<artifactId>adam-cli-spark3_2.12</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: CLI</name>
<build>
Expand Down Expand Up @@ -124,23 +124,23 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark3_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-io-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-io-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-cli-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-cli-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -150,23 +150,23 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark3_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-apis-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-apis-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-apis-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-apis-spark3_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions adam-codegen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-codegen-spark2_2.11</artifactId>
<artifactId>adam-codegen-spark3_2.12</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: Avro-to-Dataset codegen utils</name>
<properties>
Expand Down
16 changes: 8 additions & 8 deletions adam-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-core-spark2_2.11</artifactId>
<artifactId>adam-core-spark3_2.12</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: Core</name>
<build>
Expand Down Expand Up @@ -160,28 +160,28 @@
<dependencies>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark3_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-io-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-io-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-cli-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-cli-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-intervalrdd-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-intervalrdd-spark3_${scala.version.prefix}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -275,7 +275,7 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-codegen-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-codegen-spark3_${scala.version.prefix}</artifactId>
</dependency>
</dependencies>
<profiles>
Expand Down
4 changes: 2 additions & 2 deletions adam-distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-distribution-spark2_2.11</artifactId>
<artifactId>adam-distribution-spark3_2.12</artifactId>
<packaging>pom</packaging>
<name>ADAM_${scala.version.prefix}: Distribution</name>
<build>
Expand Down
4 changes: 2 additions & 2 deletions adam-python/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-python-spark2_2.11</artifactId>
<artifactId>adam-python-spark3_2.12</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: Python APIs</name>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions adam-r/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-r-spark2_2.11</artifactId>
<artifactId>adam-r-spark3_2.12</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: R APIs</name>
<properties>
Expand Down
4 changes: 2 additions & 2 deletions adam-shade/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-shade-spark2_2.11</artifactId>
<artifactId>adam-shade-spark3_2.12</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: Shader workaround</name>

Expand Down
30 changes: 15 additions & 15 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<modelVersion>4.0.0</modelVersion>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-parent-spark2_2.11</artifactId>
<artifactId>adam-parent-spark3_2.12</artifactId>
<version>0.32.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ADAM_${scala.version.prefix}</name>
Expand All @@ -19,9 +19,9 @@
<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>
<spark.version>2.4.6</spark.version>
<scala.version>2.12.8</scala.version>
<scala.version.prefix>2.12</scala.version.prefix>
<spark.version>3.0.0</spark.version>
<parquet.version>1.10.1</parquet.version>
<!-- Edit the following line to configure the Hadoop (HDFS) version. -->
<hadoop.version>2.7.5</hadoop.version>
Expand Down Expand Up @@ -349,36 +349,36 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark3_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark3_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-cli-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-cli-spark3_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-apis-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-apis-spark3_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-apis-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-apis-spark3_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark3_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand All @@ -391,7 +391,7 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark3_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
<exclusions>
<exclusion>
Expand All @@ -402,17 +402,17 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-cli-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-cli-spark3_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-intervalrdd-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-intervalrdd-spark3_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-io-spark2_${scala.version.prefix}</artifactId>
<artifactId>utils-io-spark3_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -577,7 +577,7 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-codegen-spark2_${scala.version.prefix}</artifactId>
<artifactId>adam-codegen-spark3_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down

0 comments on commit 624227b

Please sign in to comment.