Repository: spark Updated Branches: refs/heads/master 339905578 -> 50217667c
[SPARK-7669] Builds against Hadoop 2.6+ get inconsistent curator depend⦠This adds a new profile, `hadoop-2.6`, copying over the hadoop-2.4 properties, updating ZK to 3.4.6 and making the curator version a configurable option. That keeps the curator-recipes JAR in sync with that used in hadoop. There's one more option to consider: making the full curator-client version explicit with its own dependency version. This will pin down the version from hadoop and hive imports Author: Steve Loughran <ste...@hortonworks.com> Closes #6191 from steveloughran/stevel/SPARK-7669-hadoop-2.6 and squashes the following commits: e3e281a [Steve Loughran] SPARK-7669 declare the version of curator-client and curator-framework JARs 2901ea9 [Steve Loughran] SPARK-7669 Builds against Hadoop 2.6+ get inconsistent curator dependencies Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/50217667 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/50217667 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/50217667 Branch: refs/heads/master Commit: 50217667cc1239ed3b15f4d10907b727ed85d7fa Parents: 3399055 Author: Steve Loughran <ste...@hortonworks.com> Authored: Sun May 17 17:03:11 2015 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Sun May 17 17:03:11 2015 +0100 ---------------------------------------------------------------------- pom.xml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/50217667/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1b45cdb..6768a03 100644 --- a/pom.xml +++ b/pom.xml @@ -130,6 +130,7 @@ <hbase.artifact>hbase</hbase.artifact> <flume.version>1.4.0</flume.version> <zookeeper.version>3.4.5</zookeeper.version> + <curator.version>2.4.0</curator.version> <hive.group>org.spark-project.hive</hive.group> <!-- Version used in Maven Hive dependency --> <hive.version>0.13.1a</hive.version> @@ -707,7 +708,7 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> - <version>2.4.0</version> + <version>${curator.version}</version> <scope>${hadoop.deps.scope}</scope> <exclusions> <exclusion> @@ -717,6 +718,16 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + <version>${curator.version}</version> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + <version>${curator.version}</version> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> @@ -1680,6 +1691,17 @@ </profile> <profile> + <id>hadoop-2.6</id> + <properties> + <hadoop.version>2.6.0</hadoop.version> + <jets3t.version>0.9.3</jets3t.version> + <commons.math3.version>3.1.1</commons.math3.version> + <zookeeper.version>3.4.6</zookeeper.version> + <curator.version>2.6.0</curator.version> + </properties> + </profile> + + <profile> <id>yarn</id> <modules> <module>yarn</module> @@ -1709,7 +1731,7 @@ <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> - <version>2.4.0</version> + <version>${curator.version}</version> <exclusions> <exclusion> <groupId>org.apache.zookeeper</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
