DB-3305 - adding 5.4.1 to spark, cleaning up deprecated profiles

splicemachine · May 17, 2015 · 382e047 · 382e047
1 parent ead5259
commit 382e047
Showing 1 changed file with 15 additions and 91 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1248,26 +1248,6 @@
     http://hadoop.apache.org/docs/ra.b.c/hadoop-project-dist/hadoop-common/dependency-analysis.html
     -->
 
-    <profile>
-      <id>splice-hdp2.1.5</id>
-      <modules>
-        <module>yarn</module>
-        <module>network/yarn</module>
-      </modules>
-      <properties>
-        <hadoop.version>2.4.0.2.1.5.0-695</hadoop.version>
-        <hbase.version>0.98.0-hdp2.1.5-splice1.0.2-SNAPSHOT</hbase.version>
-        <flume.version>1.4.0.2.1.5.0-695</flume.version>
-        <zookeeper.version>3.4.5.2.1.5.0-695</zookeeper.version>
-        <protobuf.version>2.5.0</protobuf.version>
-        <!-- derby.version>1.1.0-SNAPSHOT</derby.version -->
-        <jets3t.version>0.9.0</jets3t.version>
-        <commons.math3.version>3.1.1</commons.math3.version>
-        <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
-        <snappy.version>1.0.4.1</snappy.version>
-      </properties>
-    </profile>
-
     <profile>
       <id>splice-hdp2.1.7</id>
       <modules>
@@ -1288,26 +1268,6 @@
       </properties>
     </profile>
 
-    <profile>
-      <id>splice-hdp2.2.0</id>
-      <modules>
-        <module>yarn</module>
-        <module>network/yarn</module>
-      </modules>
-      <properties>
-        <hadoop.version>2.6.0.2.2.0.0-2041</hadoop.version>
-        <hbase.version>0.98.0-hdp2.2.0-splice1.0.2-SNAPSHOT</hbase.version>
-        <flume.version>1.5.2.2.2.0.0-2041</flume.version>
-        <zookeeper.version>3.4.6.2.2.0.0-2041</zookeeper.version>
-        <protobuf.version>2.5.0</protobuf.version>
-        <!-- derby.version>1.1.0-SNAPSHOT</derby.version -->
-        <jets3t.version>0.9.0</jets3t.version>
-        <commons.math3.version>3.1.1</commons.math3.version>
-        <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
-        <snappy.version>1.0.4.1</snappy.version>
-      </properties>
-    </profile>
-
     <profile>
       <id>splice-hdp2.2.4</id>
       <modules>
@@ -1328,42 +1288,6 @@
       </properties>
     </profile>
 
-    <profile>
-      <id>splice-cdh4.5.0</id>
-      <properties>
-        <hadoop.version>2.0.0-cdh4.5.0</hadoop.version>
-        <hbase.version>0.94.6-cdh4.5.0-splice1.0.2-SNAPSHOT</hbase.version>
-        <flume.version>1.4.0-cdh4.5.0</flume.version>
-        <zookeeper.version>3.4.5-cdh4.5.0.1-splice</zookeeper.version>
-        <protobuf.version>2.5.0</protobuf.version>
-        <!-- derby.version>1.1.0-SNAPSHOT</derby.version -->
-        <jets3t.version>0.9.0</jets3t.version>
-        <commons.math3.version>3.1.1</commons.math3.version>
-        <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
-        <snappy.version>1.0.4.1</snappy.version>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>splice-cdh5.2.1</id>
-      <modules>
-        <module>yarn</module>
-        <module>network/yarn</module>
-      </modules>
-      <properties>
-        <hadoop.version>2.5.0-cdh5.2.1</hadoop.version>
-        <hbase.version>0.98.6-cdh5.2.1-splice1.0.2-SNAPSHOT</hbase.version>
-        <flume.version>1.5.0-cdh5.2.1</flume.version>
-        <zookeeper.version>3.4.5-cdh5.2.1</zookeeper.version>
-        <protobuf.version>2.5.0</protobuf.version>
-        <!-- derby.version>1.1.0-SNAPSHOT</derby.version -->
-        <jets3t.version>0.9.0</jets3t.version>
-        <commons.math3.version>3.1.1</commons.math3.version>
-        <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
-        <snappy.version>1.0.5</snappy.version>
-      </properties>
-    </profile>
-
     <profile>
       <id>splice-cdh5.2.4</id>
       <modules>
@@ -1385,16 +1309,16 @@
     </profile>
 
     <profile>
-      <id>splice-cdh5.3.0</id>
+      <id>splice-cdh5.3.2</id>
       <modules>
         <module>yarn</module>
         <module>network/yarn</module>
       </modules>
       <properties>
-        <hadoop.version>2.5.0-cdh5.3.0</hadoop.version>
-        <hbase.version>0.98.6-cdh5.3.0-splice1.0.2-SNAPSHOT</hbase.version>
-        <flume.version>1.5.0-cdh5.3.0</flume.version>
-        <zookeeper.version>3.4.5-cdh5.3.0</zookeeper.version>
+        <hadoop.version>2.5.0-cdh5.3.2</hadoop.version>
+        <hbase.version>0.98.6-cdh5.3.2-splice1.0.2-SNAPSHOT</hbase.version>
+        <flume.version>1.5.0-cdh5.3.2</flume.version>
+        <zookeeper.version>3.4.5-cdh5.3.2</zookeeper.version>
         <protobuf.version>2.5.0</protobuf.version>
         <!-- derby.version>1.1.0-SNAPSHOT</derby.version -->
         <jets3t.version>0.9.0</jets3t.version>
@@ -1405,16 +1329,16 @@
     </profile>
 
     <profile>
-      <id>splice-cdh5.3.2</id>
+      <id>splice-cdh5.4.0</id>
       <modules>
         <module>yarn</module>
         <module>network/yarn</module>
       </modules>
       <properties>
-        <hadoop.version>2.5.0-cdh5.3.2</hadoop.version>
-        <hbase.version>0.98.6-cdh5.3.2-splice1.0.2-SNAPSHOT</hbase.version>
-        <flume.version>1.5.0-cdh5.3.2</flume.version>
-        <zookeeper.version>3.4.5-cdh5.3.2</zookeeper.version>
+        <hadoop.version>2.6.0-cdh5.4.0</hadoop.version>
+        <hbase.version>1.0.0-cdh5.4.0</hbase.version>
+        <flume.version>1.5.0-cdh5.4.0</flume.version>
+        <zookeeper.version>3.4.5-cdh5.4.0</zookeeper.version>
         <protobuf.version>2.5.0</protobuf.version>
         <!-- derby.version>1.1.0-SNAPSHOT</derby.version -->
         <jets3t.version>0.9.0</jets3t.version>
@@ -1425,16 +1349,16 @@
     </profile>
 
     <profile>
-      <id>splice-cdh5.4.0</id>
+      <id>splice-cdh5.4.1</id>
       <modules>
         <module>yarn</module>
         <module>network/yarn</module>
       </modules>
       <properties>
-        <hadoop.version>2.6.0-cdh5.4.0</hadoop.version>
-        <hbase.version>1.0.0-cdh5.4.0</hbase.version>
-        <flume.version>1.5.0-cdh5.4.0</flume.version>
-        <zookeeper.version>3.4.5-cdh5.4.0</zookeeper.version>
+        <hadoop.version>2.6.0-cdh5.4.1</hadoop.version>
+        <hbase.version>1.0.0-cdh5.4.1</hbase.version>
+        <flume.version>1.5.0-cdh5.4.1</flume.version>
+        <zookeeper.version>3.4.5-cdh5.4.1</zookeeper.version>
         <protobuf.version>2.5.0</protobuf.version>
         <!-- derby.version>1.1.0-SNAPSHOT</derby.version -->
         <jets3t.version>0.9.0</jets3t.version>