From 50c07033ae608df557390226b0b230a7b7b69a1e Mon Sep 17 00:00:00 2001 From: Jeff Zhang Date: Wed, 26 Apr 2017 11:27:20 +0800 Subject: [PATCH] ZEPPELIN-2450. Move spark profile to pom file of parent project --- pom.xml | 470 +++++++++++++++++++++++++++++++++++++ spark-dependencies/pom.xml | 469 ------------------------------------ spark/pom.xml | 130 ---------- 3 files changed, 470 insertions(+), 599 deletions(-) diff --git a/pom.xml b/pom.xml index 3bede629380..2355dcca221 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,12 @@ 1.12.5 + 2.1.0 + 0.10.4 + 2.7.2 + 2.5.0 + 0.9.0 + hadoop2 1.7.10 1.2.17 0.9.2 @@ -1055,6 +1061,470 @@ + + + spark-1.1 + + + + + 1.1.1 + 2.2.3-shaded-protobuf + + + + + cassandra-spark-1.1 + + + com.datastax.spark + spark-cassandra-connector_${scala.binary.version} + 1.1.1 + + + org.joda + joda-convert + + + + + + 1.1.1 + 2.2.3-shaded-protobuf + + + + + spark-1.2 + + + + 1.2.1 + + + + + cassandra-spark-1.2 + + 1.2.1 + + + + com.datastax.spark + spark-cassandra-connector_${scala.binary.version} + 1.2.1 + + + org.joda + joda-convert + + + + + + + + spark-1.3 + + + 1.3.1 + + + + + + + + + cassandra-spark-1.3 + + 1.3.0 + + + + + com.datastax.spark + spark-cassandra-connector_${scala.binary.version} + 1.3.1 + + + org.joda + joda-convert + + + + + + + + spark-1.4 + + 1.4.1 + + + + + + + + cassandra-spark-1.4 + + 1.4.1 + + + + + com.datastax.spark + spark-cassandra-connector_${scala.binary.version} + 1.4.0 + + + org.joda + joda-convert + + + + + + + + spark-1.5 + + 1.5.2 + com.typesafe.akka + 2.3.11 + 2.5.0 + + + + + + + + cassandra-spark-1.5 + + 1.5.1 + com.typesafe.akka + 2.3.11 + 2.5.0 + 16.0.1 + + + + + com.datastax.spark + spark-cassandra-connector_${scala.binary.version} + 1.5.0 + + + org.joda + joda-convert + + + + + + + + spark-1.6 + + 1.6.3 + 0.9 + com.typesafe.akka + 2.3.11 + 2.5.0 + + + + + spark-2.0 + + 2.0.2 + 2.5.0 + 0.10.3 + + + + + spark-2.1 + + true + + + 2.1.0 + 2.5.0 + 0.10.4 + + + + + hadoop-0.23 + + + + org.apache.avro + avro + + + + 0.23.10 + + + + + hadoop-1 + + 1.0.4 + hadoop1 + 1.8.8 + org.spark-project.akka + + + + + hadoop-2.2 + + 2.2.0 + 2.5.0 + hadoop2 + + + + + hadoop-2.3 + + 2.3.0 + 2.5.0 + 0.9.3 + hadoop2 + + + + + hadoop-2.4 + + 2.4.0 + 2.5.0 + 0.9.3 + hadoop2 + + + + + hadoop-2.6 + + 2.6.0 + 2.5.0 + 0.9.3 + hadoop2 + + + + + hadoop-2.7 + + true + + + 2.7.2 + 2.5.0 + 0.9.0 + hadoop2 + + + + + mapr3 + + false + + + 1.0.3-mapr-3.0.3 + 2.3.0-mapr-4.0.0-FCS + 0.7.1 + + + + mapr-releases + http://repository.mapr.com/maven/ + + false + + + true + + + + + + + mapr40 + + false + + + 2.4.1-mapr-1503 + 2.4.1-mapr-1503 + 0.9.3 + + + + org.apache.curator + curator-recipes + 2.4.0 + + + org.apache.zookeeper + zookeeper + + + + + org.apache.zookeeper + zookeeper + 3.4.5-mapr-1503 + + + + + mapr-releases + http://repository.mapr.com/maven/ + + false + + + true + + + + + + + mapr41 + + false + + + 2.5.1-mapr-1503 + 2.5.1-mapr-1503 + 0.7.1 + + + + org.apache.curator + curator-recipes + 2.4.0 + + + org.apache.zookeeper + zookeeper + + + + + org.apache.zookeeper + zookeeper + 3.4.5-mapr-1503 + + + + + mapr-releases + http://repository.mapr.com/maven/ + + false + + + true + + + + + + + mapr50 + + false + + + 2.7.0-mapr-1506 + 2.7.0-mapr-1506 + 0.9.3 + + + + org.apache.curator + curator-recipes + 2.4.0 + + + org.apache.zookeeper + zookeeper + + + + + org.apache.zookeeper + zookeeper + 3.4.5-mapr-1503 + + + + + mapr-releases + http://repository.mapr.com/maven/ + + false + + + true + + + + + + + mapr51 + + false + + + 2.7.0-mapr-1602 + 2.7.0-mapr-1602 + 0.9.3 + + + + org.apache.curator + curator-recipes + 2.4.0 + + + org.apache.zookeeper + zookeeper + + + + + org.apache.zookeeper + zookeeper + 3.4.5-mapr-1503 + + + + + mapr-releases + http://repository.mapr.com/maven/ + + false + + + true + + + + diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml index 50d8ed5c1b1..327afaeffdb 100644 --- a/spark-dependencies/pom.xml +++ b/spark-dependencies/pom.xml @@ -44,13 +44,9 @@ instead of changing spark.version in this section. --> - 1.4.1 - 2.3.0 ${hadoop.version} 1.7.7 - 0.7.1 - 2.4.1 org.spark-project.akka 2.3.4-spark @@ -62,7 +58,6 @@ http://d3kbcqa49mib13.cloudfront.net/spark-${spark.version}-bin-without-hadoop.tgz - 0.8.2.1 2.3 @@ -359,471 +354,7 @@ - - - spark-1.1 - - - - 1.1.1 - 2.2.3-shaded-protobuf - - - - - cassandra-spark-1.1 - - - com.datastax.spark - spark-cassandra-connector_${scala.binary.version} - 1.1.1 - - - org.joda - joda-convert - - - - - - 1.1.1 - 2.2.3-shaded-protobuf - - - - - spark-1.2 - - - - 1.2.1 - - - - - cassandra-spark-1.2 - - 1.2.1 - - - - com.datastax.spark - spark-cassandra-connector_${scala.binary.version} - 1.2.1 - - - org.joda - joda-convert - - - - - - - - spark-1.3 - - - 1.3.1 - - - - - - - - - cassandra-spark-1.3 - - 1.3.0 - - - - - com.datastax.spark - spark-cassandra-connector_${scala.binary.version} - 1.3.1 - - - org.joda - joda-convert - - - - - - - - spark-1.4 - - 1.4.1 - - - - - - - - cassandra-spark-1.4 - - 1.4.1 - - - - - com.datastax.spark - spark-cassandra-connector_${scala.binary.version} - 1.4.0 - - - org.joda - joda-convert - - - - - - - - spark-1.5 - - 1.5.2 - com.typesafe.akka - 2.3.11 - 2.5.0 - - - - - - - - cassandra-spark-1.5 - - 1.5.1 - com.typesafe.akka - 2.3.11 - 2.5.0 - 16.0.1 - - - - - com.datastax.spark - spark-cassandra-connector_${scala.binary.version} - 1.5.0 - - - org.joda - joda-convert - - - - - - - - spark-1.6 - - 1.6.3 - 0.9 - com.typesafe.akka - 2.3.11 - 2.5.0 - - - - - spark-2.0 - - 2.0.2 - 2.5.0 - 0.10.3 - 2.11.8 - - - - - spark-2.1 - - true - - - 2.1.0 - 2.5.0 - 0.10.4 - 2.11.8 - - - - - hadoop-0.23 - - - - org.apache.avro - avro - - - - 0.23.10 - - - - - hadoop-1 - - 1.0.4 - hadoop1 - 1.8.8 - org.spark-project.akka - - - - - hadoop-2.2 - - 2.2.0 - 2.5.0 - hadoop2 - - - - - hadoop-2.3 - - 2.3.0 - 2.5.0 - 0.9.3 - hadoop2 - - - - - hadoop-2.4 - - 2.4.0 - 2.5.0 - 0.9.3 - hadoop2 - - - - - hadoop-2.6 - - 2.6.0 - 2.5.0 - 0.9.3 - hadoop2 - - - - - hadoop-2.7 - - 2.7.2 - 2.5.0 - 0.9.0 - hadoop2 - - - - - mapr3 - - false - - - 1.0.3-mapr-3.0.3 - 2.3.0-mapr-4.0.0-FCS - 0.7.1 - - - - mapr-releases - http://repository.mapr.com/maven/ - - false - - - true - - - - - - - mapr40 - - false - - - 2.4.1-mapr-1503 - 2.4.1-mapr-1503 - 0.9.3 - - - - org.apache.curator - curator-recipes - 2.4.0 - - - org.apache.zookeeper - zookeeper - - - - - org.apache.zookeeper - zookeeper - 3.4.5-mapr-1503 - - - - - mapr-releases - http://repository.mapr.com/maven/ - - false - - - true - - - - - - - mapr41 - - false - - - 2.5.1-mapr-1503 - 2.5.1-mapr-1503 - 0.7.1 - - - - org.apache.curator - curator-recipes - 2.4.0 - - - org.apache.zookeeper - zookeeper - - - - - org.apache.zookeeper - zookeeper - 3.4.5-mapr-1503 - - - - - mapr-releases - http://repository.mapr.com/maven/ - - false - - - true - - - - - - - mapr50 - - false - - - 2.7.0-mapr-1506 - 2.7.0-mapr-1506 - 0.9.3 - - - - org.apache.curator - curator-recipes - 2.4.0 - - - org.apache.zookeeper - zookeeper - - - - - org.apache.zookeeper - zookeeper - 3.4.5-mapr-1503 - - - - - mapr-releases - http://repository.mapr.com/maven/ - - false - - - true - - - - - - - mapr51 - - false - - - 2.7.0-mapr-1602 - 2.7.0-mapr-1602 - 0.9.3 - - - - org.apache.curator - curator-recipes - 2.4.0 - - - org.apache.zookeeper - zookeeper - - - - - org.apache.zookeeper - zookeeper - 3.4.5-mapr-1503 - - - - - mapr-releases - http://repository.mapr.com/maven/ - - false - - - true - - - - - - diff --git a/spark/pom.xml b/spark/pom.xml index ade4081f99f..caa255b0ec9 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -36,7 +36,6 @@ 1.8.2 - 2.0.2 14.0.1 1.3 1.9 @@ -512,133 +511,4 @@ - - - spark-1.4 - - 1.4.1 - - - - - - - - spark-1.5 - - 1.5.2 - com.typesafe.akka - 2.3.11 - 2.5.0 - - - - - spark-1.6 - - 1.6.3 - 0.9 - com.typesafe.akka - 2.3.11 - 2.5.0 - - - - - spark-2.0 - - 2.0.2 - 2.5.0 - 0.10.3 - 2.11.8 - - - - - spark-2.1 - - true - - - 2.1.0 - 2.5.0 - 0.10.4 - 2.11.8 - - - - - hadoop-0.23 - - - - org.apache.avro - avro - - - - 0.23.10 - - - - - hadoop-1 - - 1.0.4 - hadoop1 - 1.8.8 - org.spark-project.akka - - - - - hadoop-2.2 - - 2.2.0 - 2.5.0 - hadoop2 - - - - - hadoop-2.3 - - 2.3.0 - 2.5.0 - 0.9.3 - hadoop2 - - - - - hadoop-2.4 - - 2.4.0 - 2.5.0 - 0.9.3 - hadoop2 - - - - - hadoop-2.6 - - 2.6.0 - 2.5.0 - 0.9.3 - hadoop2 - - - - - hadoop-2.7 - - 2.7.2 - 2.5.0 - 0.9.0 - hadoop2 - - -