Repository: zeppelin Updated Branches: refs/heads/master 223d225e0 -> d371d96b9
[MINOR] Removed unused profiles from spark/pom.xml ### What is this PR for? Making spark/pom.xml simple ### What type of PR is it? [Refactoring] ### Todos * [x] - Simplified pom.xml in spark ### What is the Jira issue? N/A ### How should this be tested? No test. CI should be green ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jongyoul Lee <jongy...@gmail.com> Closes #1301 from jongyoul/minor/remove-unused-profile-spark-pom and squashes the following commits: 10c7bb7 [Jongyoul Lee] Removed yarn dependency b6d8876 [Jongyoul Lee] Removed yarn dependency 77ddd95 [Jongyoul Lee] Removed unused profiles from spark/pom.xml Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d371d96b Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d371d96b Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d371d96b Branch: refs/heads/master Commit: d371d96b9ca79d7d9b3e4cb372789f4f864ebe27 Parents: 223d225 Author: Jongyoul Lee <jongy...@gmail.com> Authored: Mon Aug 8 16:18:32 2016 +0900 Committer: Jongyoul Lee <jongy...@apache.org> Committed: Wed Aug 31 19:21:10 2016 +0900 ---------------------------------------------------------------------- spark/pom.xml | 323 ----------------------------------------------------- 1 file changed, 323 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d371d96b/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index 5dcbb51..84c3770 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -483,27 +483,6 @@ </profile> <profile> - <id>cassandra-spark-1.1</id> - <dependencies> - <dependency> - <groupId>com.datastax.spark</groupId> - <artifactId>spark-cassandra-connector_${scala.binary.version}</artifactId> - <version>1.1.1</version> - <exclusions> - <exclusion> - <groupId>org.joda</groupId> - <artifactId>joda-convert</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <properties> - <spark.version>1.1.1</spark.version> - <akka.version>2.2.3-shaded-protobuf</akka.version> - </properties> - </profile> - - <profile> <id>spark-1.2</id> <dependencies> </dependencies> @@ -513,26 +492,6 @@ </profile> <profile> - <id>cassandra-spark-1.2</id> - <properties> - <spark.version>1.2.1</spark.version> - </properties> - <dependencies> - <dependency> - <groupId>com.datastax.spark</groupId> - <artifactId>spark-cassandra-connector_${scala.binary.version}</artifactId> - <version>1.2.1</version> - <exclusions> - <exclusion> - <groupId>org.joda</groupId> - <artifactId>joda-convert</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - - <profile> <id>spark-1.3</id> <properties> @@ -545,27 +504,6 @@ </profile> <profile> - <id>cassandra-spark-1.3</id> - <properties> - <spark.version>1.3.0</spark.version> - </properties> - - <dependencies> - <dependency> - <groupId>com.datastax.spark</groupId> - <artifactId>spark-cassandra-connector_${scala.binary.version}</artifactId> - <version>1.3.1</version> - <exclusions> - <exclusion> - <groupId>org.joda</groupId> - <artifactId>joda-convert</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - - <profile> <id>spark-1.4</id> <properties> <spark.version>1.4.1</spark.version> @@ -576,27 +514,6 @@ </profile> <profile> - <id>cassandra-spark-1.4</id> - <properties> - <spark.version>1.4.1</spark.version> - </properties> - - <dependencies> - <dependency> - <groupId>com.datastax.spark</groupId> - <artifactId>spark-cassandra-connector_${scala.binary.version}</artifactId> - <version>1.4.0</version> - <exclusions> - <exclusion> - <groupId>org.joda</groupId> - <artifactId>joda-convert</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - - <profile> <id>spark-1.5</id> <properties> <spark.version>1.5.2</spark.version> @@ -604,34 +521,6 @@ <akka.version>2.3.11</akka.version> <protobuf.version>2.5.0</protobuf.version> </properties> - - <dependencies> - </dependencies> - </profile> - - <profile> - <id>cassandra-spark-1.5</id> - <properties> - <spark.version>1.5.1</spark.version> - <akka.group>com.typesafe.akka</akka.group> - <akka.version>2.3.11</akka.version> - <protobuf.version>2.5.0</protobuf.version> - <guava.version>16.0.1</guava.version> - </properties> - - <dependencies> - <dependency> - <groupId>com.datastax.spark</groupId> - <artifactId>spark-cassandra-connector_${scala.binary.version}</artifactId> - <version>1.5.0</version> - <exclusions> - <exclusion> - <groupId>org.joda</groupId> - <artifactId>joda-convert</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> </profile> <profile> @@ -732,218 +621,6 @@ </properties> </profile> - <profile> - <id>mapr3</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <hadoop.version>1.0.3-mapr-3.0.3</hadoop.version> - <yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version> - <jets3t.version>0.7.1</jets3t.version> - </properties> - <repositories> - <repository> - <id>mapr-releases</id> - <url>http://repository.mapr.com/maven/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - - <profile> - <id>mapr40</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <hadoop.version>2.4.1-mapr-1503</hadoop.version> - <yarn.version>2.4.1-mapr-1503</yarn.version> - <jets3t.version>0.9.3</jets3t.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> - <version>2.4.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.4.5-mapr-1503</version> - </dependency> - </dependencies> - <repositories> - <repository> - <id>mapr-releases</id> - <url>http://repository.mapr.com/maven/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - - <profile> - <id>mapr41</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <hadoop.version>2.5.1-mapr-1503</hadoop.version> - <yarn.version>2.5.1-mapr-1503</yarn.version> - <jets3t.version>0.7.1</jets3t.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> - <version>2.4.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.4.5-mapr-1503</version> - </dependency> - </dependencies> - <repositories> - <repository> - <id>mapr-releases</id> - <url>http://repository.mapr.com/maven/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - - <profile> - <id>mapr50</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <hadoop.version>2.7.0-mapr-1506</hadoop.version> - <yarn.version>2.7.0-mapr-1506</yarn.version> - <jets3t.version>0.9.3</jets3t.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> - <version>2.4.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.4.5-mapr-1503</version> - </dependency> - </dependencies> - <repositories> - <repository> - <id>mapr-releases</id> - <url>http://repository.mapr.com/maven/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - - <profile> - <id>mapr51</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <hadoop.version>2.7.0-mapr-1602</hadoop.version> - <yarn.version>2.7.0-mapr-1602</yarn.version> - <jets3t.version>0.9.3</jets3t.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> - <version>2.4.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>3.4.5-mapr-1503</version> - </dependency> - </dependencies> - <repositories> - <repository> - <id>mapr-releases</id> - <url>http://repository.mapr.com/maven/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - - <profile> - <id>yarn</id> - <properties> - <yarn.version>${hadoop.version}</yarn.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.spark</groupId> - <artifactId>spark-yarn_${scala.binary.version}</artifactId> - <version>${spark.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-api</artifactId> - <version>${yarn.version}</version> - </dependency> - </dependencies> - </profile> - <!-- include sparkr in the build --> <profile> <id>sparkr</id>
