Repository: kudu Updated Branches: refs/heads/master 6de378296 -> 88e73f4f4
[java] Fix spark-avro scala binary version Fixes the spark-avro scala binary version to be 2.11 and updates all dependencies to use the scala.binary.version property to prevent future typo mistakes. Change-Id: Ib15160db31b152f6512ad9781ab54f6b8744ff44 Reviewed-on: http://gerrit.cloudera.org:8080/7644 Reviewed-by: Jean-Daniel Cryans <jdcry...@apache.org> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/88e73f4f Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/88e73f4f Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/88e73f4f Branch: refs/heads/master Commit: 88e73f4f44d81fe7a235528b8fbd2243734a7961 Parents: 6de3782 Author: Grant Henke <granthe...@gmail.com> Authored: Thu Aug 10 12:47:55 2017 -0500 Committer: Jean-Daniel Cryans <jdcry...@apache.org> Committed: Thu Aug 10 19:23:46 2017 +0000 ---------------------------------------------------------------------- java/kudu-spark-tools/pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/88e73f4f/java/kudu-spark-tools/pom.xml ---------------------------------------------------------------------- diff --git a/java/kudu-spark-tools/pom.xml b/java/kudu-spark-tools/pom.xml index 98ffe28..46b20cd 100644 --- a/java/kudu-spark-tools/pom.xml +++ b/java/kudu-spark-tools/pom.xml @@ -44,7 +44,7 @@ </dependency> <dependency> <groupId>org.apache.kudu</groupId> - <artifactId>kudu-spark2_2.11</artifactId> + <artifactId>kudu-spark2_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -55,7 +55,7 @@ <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.11</artifactId> + <artifactId>spark-core_${scala.binary.version}</artifactId> <version>${spark2.version}</version> <scope>provided</scope> <exclusions> @@ -73,14 +73,14 @@ </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_2.11</artifactId> + <artifactId>spark-sql_${scala.binary.version}</artifactId> <version>${spark2.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>${scala-2.11.version}</version> + <version>${scala.version}</version> <scope>provided</scope> </dependency> @@ -93,14 +93,14 @@ </dependency> <dependency> <groupId>org.apache.kudu</groupId> - <artifactId>kudu-spark2_2.11</artifactId> + <artifactId>kudu-spark2_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>com.databricks</groupId> - <artifactId>spark-avro_2.10</artifactId> + <artifactId>spark-avro_${scala.binary.version}</artifactId> <version>${sparkavro.version}</version> </dependency> <dependency> @@ -117,7 +117,7 @@ </dependency> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.11</artifactId> + <artifactId>scalatest_${scala.binary.version}</artifactId> <version>${scalatest.version}</version> <scope>test</scope> </dependency> @@ -137,7 +137,7 @@ <version>3.2.0</version> <configuration> <charset>${project.build.sourceEncoding}</charset> - <scalaVersion>${scala-2.11.version}</scalaVersion> + <scalaVersion>${scala.version}</scalaVersion> <args> <!-- Emit warning and location for usages of features that should be imported explicitly. --> <arg>-feature</arg>