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 2014/11/12 16:39:24 UTC
[1/2] incubator-slider git commit: SLIDER-643 revert to
2.6.0-SNAPSHOT profile for jenkins
Repository: incubator-slider
Updated Branches:
refs/heads/develop a0a9c51ca -> 26bb9d743
refs/heads/releases/slider-0.60 50158dc91 -> a9deb0691
SLIDER-643 revert to 2.6.0-SNAPSHOT profile for jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a9deb069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a9deb069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a9deb069
Branch: refs/heads/releases/slider-0.60
Commit: a9deb0691e134a5a1c88b9243937847eee6c6868
Parents: 50158dc
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 12 15:37:39 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 12 15:37:39 2014 +0000
----------------------------------------------------------------------
pom.xml | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a9deb069/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5a1d55c..6cf66ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
<!--
core artifacts
-->
- <hadoop.version>2.6.0</hadoop.version>
+ <hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
<hbase.version>0.98.4-hadoop2</hbase.version>
<accumulo.version>1.6.1</accumulo.version>
@@ -1405,12 +1405,18 @@
</profile>
<profile>
- <!-- local builds of everything -->
- <id>local</id>
+ <!-- 2.6 snapshots -->
+ <id>branch-2.6</id>
<properties>
<hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
- <hbase.version>0.98.5-SNAPSHOT</hbase.version>
- <accumulo.version>1.6.0-SNAPSHOT</accumulo.version>
+ </properties>
+ </profile>
+
+ <profile>
+ <!-- 2.6 snapshots -->
+ <id>release-2.6</id>
+ <properties>
+ <hadoop.version>2.6.0</hadoop.version>
</properties>
</profile>
@@ -1424,13 +1430,29 @@
<profile>
<!-- hadoop trunk builds -->
- <id>hadoop-trunk</id>
+ <id>trunk</id>
<properties>
<hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
</properties>
</profile>
<profile>
+ <!-- Java 7 build -->
+ <id>java7</id>
+ <properties>
+ <project.java.src.version>7</project.java.src.version>
+ </properties>
+ </profile>
+
+ <profile>
+ <!-- Java 8 build -->
+ <id>java8</id>
+ <properties>
+ <project.java.src.version>8</project.java.src.version>
+ </properties>
+ </profile>
+
+ <profile>
<!-- anything for a jenkins build -->
<id>jenkins</id>
<properties>
[2/2] incubator-slider git commit: SLIDER-643 revert to
2.6.0-SNAPSHOT profile for jenkins. Develop/ patch stays on 2.6,
but adds release-2.6 and branch-2.6 profiles
Posted by st...@apache.org.
SLIDER-643 revert to 2.6.0-SNAPSHOT profile for jenkins. Develop/ patch stays on 2.6, but adds release-2.6 and branch-2.6 profiles
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/26bb9d74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/26bb9d74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/26bb9d74
Branch: refs/heads/develop
Commit: 26bb9d743c4e88f15a15f357e229b7a9cd06d6e9
Parents: a0a9c51
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 12 15:39:09 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 12 15:39:09 2014 +0000
----------------------------------------------------------------------
pom.xml | 32 +++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/26bb9d74/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7aa59ff..1e61340 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1405,12 +1405,18 @@
</profile>
<profile>
- <!-- local builds of everything -->
- <id>local</id>
+ <!-- 2.6 snapshots -->
+ <id>branch-2.6</id>
<properties>
<hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
- <hbase.version>0.98.5-SNAPSHOT</hbase.version>
- <accumulo.version>1.6.0-SNAPSHOT</accumulo.version>
+ </properties>
+ </profile>
+
+ <profile>
+ <!-- 2.6 snapshots -->
+ <id>release-2.6</id>
+ <properties>
+ <hadoop.version>2.6.0</hadoop.version>
</properties>
</profile>
@@ -1424,13 +1430,29 @@
<profile>
<!-- hadoop trunk builds -->
- <id>hadoop-trunk</id>
+ <id>trunk</id>
<properties>
<hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
</properties>
</profile>
<profile>
+ <!-- Java 7 build -->
+ <id>java7</id>
+ <properties>
+ <project.java.src.version>7</project.java.src.version>
+ </properties>
+ </profile>
+
+ <profile>
+ <!-- Java 8 build -->
+ <id>java8</id>
+ <properties>
+ <project.java.src.version>8</project.java.src.version>
+ </properties>
+ </profile>
+
+ <profile>
<!-- anything for a jenkins build -->
<id>jenkins</id>
<properties>