You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2016/02/09 20:38:09 UTC
incubator-slider git commit: SLIDER-1085 slider won't build against
Hadoop 2.6.x: no hadoop-azure
Repository: incubator-slider
Updated Branches:
refs/heads/develop fff09a7f1 -> e4ac8ac2c
SLIDER-1085 slider won't build against Hadoop 2.6.x: no hadoop-azure
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e4ac8ac2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e4ac8ac2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e4ac8ac2
Branch: refs/heads/develop
Commit: e4ac8ac2c2c436b200a7a058ba0c919989442bc0
Parents: fff09a7
Author: Steve Loughran <st...@apache.org>
Authored: Mon Feb 8 11:34:41 2016 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Feb 8 11:49:08 2016 +0000
----------------------------------------------------------------------
bin/release.xml | 2 +-
pom.xml | 22 ++++++++++++++--------
slider-assembly/pom.xml | 15 ++++++++++-----
3 files changed, 25 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e4ac8ac2/bin/release.xml
----------------------------------------------------------------------
diff --git a/bin/release.xml b/bin/release.xml
index 714aebb..603d1fc 100644
--- a/bin/release.xml
+++ b/bin/release.xml
@@ -73,7 +73,7 @@
<require property="release.rc.suffix" />
<property name="mvn.skiptests" value="-DskipTests" />
- <property name="mvn.profile" value=" -Papache-release" />
+ <property name="mvn.profile" value=" -Papache-release -Pazure" />
<property name="mvn.extra.args" value="" />
<property name="release.name" value="slider-${slider.release.version}" />
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e4ac8ac2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fe423bf..b616e15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -631,12 +631,6 @@
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-azure</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
@@ -1636,7 +1630,7 @@
<!-- 2.6 snapshots -->
<id>branch-2.6</id>
<properties>
- <hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
+ <hadoop.version>2.6.5-SNAPSHOT</hadoop.version>
</properties>
</profile>
@@ -1644,7 +1638,7 @@
<!-- 2.6 -->
<id>release-2.6</id>
<properties>
- <hadoop.version>2.6.0</hadoop.version>
+ <hadoop.version>2.6.3</hadoop.version>
<curator.version>2.4.1</curator.version>
</properties>
</profile>
@@ -1710,6 +1704,18 @@
</profile>
<profile>
+ <id>azure</id>
+ <dependencies>
+ <!--Hadoop 2.6 doesn't have this artifact-->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-azure</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
<id>strict</id>
<!--enable this if you want to get told off about dependency conflict-->
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e4ac8ac2/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index 287e4cf..a64dd71 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -510,6 +510,16 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>azure</id>
+ <dependencies>
+ <!--Hadoop 2.6 doesn't have this artifact-->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-azure</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
@@ -549,11 +559,6 @@
<artifactId>hadoop-aws</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-azure</artifactId>
- </dependency>
-
</dependencies>
</project>