Skip to content

Commit

Permalink
Modifying pom.xml files for Spark 2, Scala 2.10 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
@heuermh
heuermh committed Jan 6, 2017
1 parent da1d3a5 commit b4ca096
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 41 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_2.10</artifactId>
<artifactId>adam-parent-spark2_2.10</artifactId>
<version>0.20.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-apis_2.10</artifactId>
<artifactId>adam-apis-spark2_2.10</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: APIs for Java</name>
<build>
Expand Down Expand Up @@ -104,7 +104,7 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand All @@ -114,11 +114,11 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 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_2.10</artifactId>
<artifactId>adam-parent-spark2_2.10</artifactId>
<version>0.20.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-assembly_2.10</artifactId>
<artifactId>adam-assembly-spark2_2.10</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: Assembly</name>
<properties>
Expand Down Expand Up @@ -114,7 +114,7 @@
<dependencies>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-cli_${scala.version.prefix}</artifactId>
<artifactId>adam-cli-spark2_${scala.version.prefix}</artifactId>
</dependency>
</dependencies>
</project>
22 changes: 11 additions & 11 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_2.10</artifactId>
<artifactId>adam-parent-spark2_2.10</artifactId>
<version>0.20.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-cli_2.10</artifactId>
<artifactId>adam-cli-spark2_2.10</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: CLI</name>
<properties>
Expand Down Expand Up @@ -115,47 +115,47 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-io_${scala.version.prefix}</artifactId>
<artifactId>utils-io-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-cli_${scala.version.prefix}</artifactId>
<artifactId>utils-cli-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-metrics_${scala.version.prefix}</artifactId>
<artifactId>utils-metrics-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.bdg-formats</groupId>
<artifactId>bdg-formats</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-apis_${scala.version.prefix}</artifactId>
<artifactId>adam-apis-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-apis_${scala.version.prefix}</artifactId>
<artifactId>adam-apis-spark2_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
14 changes: 7 additions & 7 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_2.10</artifactId>
<artifactId>adam-parent-spark2_2.10</artifactId>
<version>0.20.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-core_2.10</artifactId>
<artifactId>adam-core-spark2_2.10</artifactId>
<packaging>jar</packaging>
<name>ADAM_${scala.version.prefix}: Core</name>
<build>
Expand Down Expand Up @@ -92,25 +92,25 @@
<dependencies>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-metrics_${scala.version.prefix}</artifactId>
<artifactId>utils-metrics-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-io_${scala.version.prefix}</artifactId>
<artifactId>utils-io-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-cli_${scala.version.prefix}</artifactId>
<artifactId>utils-cli-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-intervalrdd_${scala.version.prefix}</artifactId>
<artifactId>utils-intervalrdd-spark2_${scala.version.prefix}</artifactId>
</dependency>
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
Expand Down
4 changes: 2 additions & 2 deletions 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_2.10</artifactId>
<artifactId>adam-parent-spark2_2.10</artifactId>
<version>0.20.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>adam-distribution_2.10</artifactId>
<artifactId>adam-distribution-spark2_2.10</artifactId>
<packaging>pom</packaging>
<name>ADAM_${scala.version.prefix}: Distribution</name>
<build>
Expand Down
26 changes: 13 additions & 13 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_2.10</artifactId>
<artifactId>adam-parent-spark2_2.10</artifactId>
<version>0.20.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ADAM_${scala.version.prefix}</name>
Expand All @@ -21,7 +21,7 @@
<avro.version>1.8.0</avro.version>
<scala.version>2.10.6</scala.version>
<scala.version.prefix>2.10</scala.version.prefix>
<spark.version>1.6.3</spark.version>
<spark.version>2.0.0</spark.version>
<parquet.version>1.8.1</parquet.version>
<!-- Edit the following line to configure the Hadoop (HDFS) version. -->
<hadoop.version>2.7.3</hadoop.version>
Expand Down Expand Up @@ -339,36 +339,36 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark2_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-core_${scala.version.prefix}</artifactId>
<artifactId>adam-core-spark2_${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_${scala.version.prefix}</artifactId>
<artifactId>adam-cli-spark2_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-apis_${scala.version.prefix}</artifactId>
<artifactId>adam-apis-spark2_${scala.version.prefix}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.adam</groupId>
<artifactId>adam-apis_${scala.version.prefix}</artifactId>
<artifactId>adam-apis-spark2_${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_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand All @@ -381,7 +381,7 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-misc_${scala.version.prefix}</artifactId>
<artifactId>utils-misc-spark2_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
<exclusions>
<exclusion>
Expand All @@ -392,17 +392,17 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-cli_${scala.version.prefix}</artifactId>
<artifactId>utils-cli-spark2_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-intervalrdd_${scala.version.prefix}</artifactId>
<artifactId>utils-intervalrdd-spark2_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-io_${scala.version.prefix}</artifactId>
<artifactId>utils-io-spark2_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
<exclusions>
<exclusion>
Expand All @@ -413,7 +413,7 @@
</dependency>
<dependency>
<groupId>org.bdgenomics.utils</groupId>
<artifactId>utils-metrics_${scala.version.prefix}</artifactId>
<artifactId>utils-metrics-spark2_${scala.version.prefix}</artifactId>
<version>${bdg-utils.version}</version>
</dependency>
<dependency>
Expand Down

0 comments on commit b4ca096

Please sign in to comment.