Repository: incubator-slider Updated Branches: refs/heads/develop 04fd60bc9 -> e9daccd5e
SLIDER-910 add Hadoop 2.7.1 profile, move branch-2 version to 2.8.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7f6a183c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7f6a183c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7f6a183c Branch: refs/heads/develop Commit: 7f6a183cc67a396c53aa74df6558fb139749e04b Parents: 04fd60b Author: Steve Loughran <[email protected]> Authored: Mon Jul 13 15:55:16 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Mon Jul 13 15:57:42 2015 +0100 ---------------------------------------------------------------------- pom.xml | 32 ++++++++++++++++++++++++++++---- slider-core/pom.xml | 8 ++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f6a183c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6a2f850..7f8ff5e 100644 --- a/pom.xml +++ b/pom.xml @@ -1141,6 +1141,12 @@ </dependency> <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-recipes</artifactId> + <version>${curator.version}</version> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> @@ -1589,17 +1595,31 @@ <profile> <!-- 2.7.0 --> - <id>release-2.7</id> + <id>release-2.7.0</id> <properties> <hadoop.version>2.7.0</hadoop.version> + <curator.version>2.7.1</curator.version> + <zookeeper.version>3.4.6</zookeeper.version> </properties> </profile> <profile> - <!-- hadoop branch-2.7 builds --> - <id>branch-2.7</id> + <!-- hadoop 2.7.1 --> + <id>release-2.7.1</id> + <properties> + <hadoop.version>2.7.1</hadoop.version> + <curator.version>2.7.1</curator.version> + <zookeeper.version>3.4.6</zookeeper.version> + </properties> + </profile> + + <profile> + <!-- hadoop 2.7.1 --> + <id>release-2.7</id> <properties> - <hadoop.version>2.7.1-SNAPSHOT</hadoop.version> + <hadoop.version>2.7.1</hadoop.version> + <curator.version>2.7.1</curator.version> + <zookeeper.version>3.4.6</zookeeper.version> </properties> </profile> @@ -1608,6 +1628,8 @@ <id>branch-2</id> <properties> <hadoop.version>2.8.0-SNAPSHOT</hadoop.version> + <curator.version>2.7.1</curator.version> + <zookeeper.version>3.4.6</zookeeper.version> </properties> </profile> @@ -1616,6 +1638,8 @@ <id>trunk</id> <properties> <hadoop.version>3.0.0-SNAPSHOT</hadoop.version> + <curator.version>2.7.1</curator.version> + <zookeeper.version>3.4.6</zookeeper.version> </properties> </profile> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f6a183c/slider-core/pom.xml ---------------------------------------------------------------------- diff --git a/slider-core/pom.xml b/slider-core/pom.xml index 8d48390..1a366de 100644 --- a/slider-core/pom.xml +++ b/slider-core/pom.xml @@ -369,6 +369,14 @@ <artifactId>curator-framework</artifactId> </dependency> + <!-- not directly needed by the registry, but inserted to + retain control over which version is on the classpath. + Otherwise, slider-core gets the version Hadoop-common depends on --> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-recipes</artifactId> + </dependency> + <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId>
