Repository: oozie Updated Branches: refs/heads/master 5a689c62e -> e6b5c95ef
OOZIE-2571 Add spark.scala.binary.version Maven property so that Scala 2.11 can be used (jonathak via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/e6b5c95e Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/e6b5c95e Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/e6b5c95e Branch: refs/heads/master Commit: e6b5c95efb492a70087377db45524e06f803459e Parents: 5a689c6 Author: Robert Kanter <[email protected]> Authored: Thu Sep 15 17:08:14 2016 -0700 Committer: Robert Kanter <[email protected]> Committed: Thu Sep 15 17:08:14 2016 -0700 ---------------------------------------------------------------------- examples/pom.xml | 2 +- pom.xml | 1 + release-log.txt | 1 + sharelib/spark/pom.xml | 22 +++++++++++----------- 4 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/e6b5c95e/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 951975f..0452836 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -112,7 +112,7 @@ <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> <exclusions> http://git-wip-us.apache.org/repos/asf/oozie/blob/e6b5c95e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 52ce311..759d76e 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,7 @@ <sqoop.version>1.4.3</sqoop.version> <spark.version>1.6.1</spark.version> <spark.guava.version>14.0.1</spark.guava.version> + <spark.scala.binary.version>2.10</spark.scala.binary.version> <sqoop.classifier>hadoop100</sqoop.classifier> <streaming.version>${hadoop.version}</streaming.version> <distcp.version>${hadoop.version}</distcp.version> http://git-wip-us.apache.org/repos/asf/oozie/blob/e6b5c95e/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 000a9a6..a71ea12 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2571 Add spark.scala.binary.version Maven property so that Scala 2.11 can be used (jonathak via rkanter) OOZIE-2530 Allow Hive to use a different jline version (poeppt via rkanter) OOZIE-2660 Create documentation for DB Dump/Load functionality (gezapeti via rkanter) OOZIE-2659 TestPauseTransitService is flaky (gezapeti via rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/e6b5c95e/sharelib/spark/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/spark/pom.xml b/sharelib/spark/pom.xml index 748ae06..f7e96f7 100644 --- a/sharelib/spark/pom.xml +++ b/sharelib/spark/pom.xml @@ -61,7 +61,7 @@ </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-core_2.10</artifactId> + <artifactId>spark-core_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> <exclusions> @@ -105,13 +105,13 @@ </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-graphx_2.10</artifactId> + <artifactId>spark-graphx_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-hive_2.10</artifactId> + <artifactId>spark-hive_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> <exclusions> @@ -171,43 +171,43 @@ </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-mllib_2.10</artifactId> + <artifactId>spark-mllib_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-repl_2.10</artifactId> + <artifactId>spark-repl_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-sql_2.10</artifactId> + <artifactId>spark-sql_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming_2.10</artifactId> + <artifactId>spark-streaming_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming-flume_2.10</artifactId> + <artifactId>spark-streaming-flume_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-streaming-kafka_2.10</artifactId> + <artifactId>spark-streaming-kafka_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-bagel_2.10</artifactId> + <artifactId>spark-bagel_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> </dependency> @@ -327,7 +327,7 @@ <dependencies> <dependency> <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn_2.10</artifactId> + <artifactId>spark-yarn_${spark.scala.binary.version}</artifactId> <version>${spark.version}</version> <scope>compile</scope> <exclusions>
