ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-7669] Builds against Hadoop 2.6+ get inconsistent curator depend…

Browse source 
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 <stevel@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

(cherry picked from commit 50217667cc)
Signed-off-by: Sean Owen <sowen@cloudera.com>
This commit is contained in:
Steve Loughran 2015-05-17 17:03:11 +01:00 committed by Sean Owen
parent 898be62489
commit 0feb3ded2e
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pom.xml
View file

@ -130,6 +130,7 @@
<hbase.artifact>hbase</hbase.artifact> <hbase.artifact>hbase</hbase.artifact>
<flume.version>1.4.0</flume.version> <flume.version>1.4.0</flume.version>
<zookeeper.version>3.4.5</zookeeper.version> <zookeeper.version>3.4.5</zookeeper.version>
<curator.version>2.4.0</curator.version>
<hive.group>org.spark-project.hive</hive.group> <hive.group>org.spark-project.hive</hive.group>
<!-- Version used in Maven Hive dependency --> <!-- Version used in Maven Hive dependency -->
<hive.version>0.13.1a</hive.version> <hive.version>0.13.1a</hive.version>
@ -707,7 +708,7 @@
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId> <artifactId>curator-recipes</artifactId>
<version>2.4.0</version> <version>${curator.version}</version>
<scope>${hadoop.deps.scope}</scope> <scope>${hadoop.deps.scope}</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -716,6 +717,16 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId> <artifactId>hadoop-client</artifactId>
@ -1679,6 +1690,17 @@
</properties> </properties>
</profile> </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> <profile>
<id>yarn</id> <id>yarn</id>
<modules> <modules>
@ -1709,7 +1731,7 @@
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId> <artifactId>curator-recipes</artifactId>
<version>2.4.0</version> <version>${curator.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>