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 2015/05/19 12:14:42 UTC

[6/6] incubator-slider git commit: SLIDER-884 separate release-2.7 and branch-2.7 branches

SLIDER-884 separate release-2.7 and branch-2.7 branches


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e94aa269
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e94aa269
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e94aa269

Branch: refs/heads/develop
Commit: e94aa2696a2d20138fab09064aadd20ae224f6db
Parents: 3616951
Author: Steve Loughran <st...@apache.org>
Authored: Tue May 19 11:14:19 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue May 19 11:14:19 2015 +0100

----------------------------------------------------------------------
 pom.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e94aa269/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fa81da4..6a2f850 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1580,7 +1580,7 @@
     </profile>
 
     <profile>
-      <!-- 2.6 snapshots -->
+      <!-- 2.6 -->
       <id>release-2.6</id>
       <properties>
         <hadoop.version>2.6.0</hadoop.version>
@@ -1588,10 +1588,18 @@
     </profile>
 
     <profile>
+      <!-- 2.7.0 -->
+      <id>release-2.7</id>
+      <properties>
+        <hadoop.version>2.7.0</hadoop.version>
+      </properties>
+    </profile>
+
+    <profile>
       <!-- hadoop branch-2.7 builds  -->
       <id>branch-2.7</id>
       <properties>
-        <hadoop.version>2.7.0</hadoop.version>
+        <hadoop.version>2.7.1-SNAPSHOT</hadoop.version>
       </properties>
     </profile>
 
@@ -1615,7 +1623,10 @@
       <!-- Java 8 build -->
       <id>java8</id>
       <properties>
-       <project.java.src.version>8</project.java.src.version>
+        <project.java.src.version>1.8</project.java.src.version>
+<!--
+        <jersey.version>1.19</jersey.version>
+-->
       </properties>
     </profile>