commit a9deb0691e134a5a1c88b9243937847eee6c6868
author Steve Loughran <stevel@apache.org> Wed Nov 12 15:37:39 2014 +0000
committer Steve Loughran <stevel@apache.org> Wed Nov 12 15:37:39 2014 +0000
tree 0438f71fc4dd685f081a62eb3dad95d49b2ea447
parent 50158dc91e6d6ddc70a898631f0530425fcce125

SLIDER-643 revert to 2.6.0-SNAPSHOT profile for jenkins

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>