Repository: zeppelin Updated Branches: refs/heads/master e8860cffa -> 8fe914b5d
[HOTFIX] Copy spark profiles from spark-dependencies to spark module to solve CI problem ### What is this PR for? ### What type of PR is it? Hot Fix ### Todos * [x] - Copy spark profiles from spark-dependencies/pom.xml to spark/pom.xml ### What is the Jira issue? ### How should this be tested? ### 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: Lee moon soo <[email protected]> Closes #1292 from Leemoonsoo/spark_profile and squashes the following commits: 5ca88b4 [Lee moon soo] handle sparkr profile with spark* profiles e5cb5df [Lee moon soo] copy spark related profiles from spark-dependencies/pom.xml to 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/8fe914b5 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8fe914b5 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8fe914b5 Branch: refs/heads/master Commit: 8fe914b5d4b03d83a580e4d40624dc8122835e32 Parents: e8860cf Author: Lee moon soo <[email protected]> Authored: Sat Aug 6 01:15:28 2016 -0700 Committer: Lee moon soo <[email protected]> Committed: Sat Aug 6 07:47:35 2016 -0700 ---------------------------------------------------------------------- spark/pom.xml | 529 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 508 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8fe914b5/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index eb208fd..19a199e 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -434,11 +434,514 @@ </executions> </plugin> + <!-- exclude sparkr by default. sparkr is enabled by profile 'sparkr' --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/SparkRInterpreter.java</exclude> + </excludes> + <testExcludes> + <testExclude>**/SparkRInterpreterTest.java</testExclude> + <testExclude>**/ZeppelinRTest.java</testExclude> + </testExcludes> + </configuration> + </plugin> + <plugin> + <groupId>org.scala-tools</groupId> + <artifactId>maven-scala-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/ZeppelinR.scala</exclude> + <exclude>**/SparkRBackend.scala</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/SparkRInterpreterTest.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> <profiles> - <!-- to deactivate 'exclude-sparkr' automatically when 'spark' is activated --> + <profile> + <id>spark-1.1</id> + <dependencies> + + </dependencies> + <properties> + <spark.version>1.1.1</spark.version> + <akka.version>2.2.3-shaded-protobuf</akka.version> + </properties> + </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> + <properties> + <spark.version>1.2.1</spark.version> + </properties> + </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> + <spark.version>1.3.1</spark.version> + </properties> + + <dependencies> + </dependencies> + + </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> + </properties> + + <dependencies> + </dependencies> + </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> + <akka.group>com.typesafe.akka</akka.group> + <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> + <id>spark-1.6</id> + <properties> + <spark.version>1.6.1</spark.version> + <py4j.version>0.9</py4j.version> + <akka.group>com.typesafe.akka</akka.group> + <akka.version>2.3.11</akka.version> + <protobuf.version>2.5.0</protobuf.version> + </properties> + </profile> + + <profile> + <id>spark-2.0</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <spark.version>2.0.0</spark.version> + <protobuf.version>2.5.0</protobuf.version> + <py4j.version>0.10.1</py4j.version> + <scala.version>2.11.8</scala.version> + </properties> + </profile> + + <profile> + <id>hadoop-0.23</id> + <!-- SPARK-1121: Adds an explicit dependency on Avro to work around a + Hadoop 0.23.X issue --> + <dependencies> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </dependency> + </dependencies> + <properties> + <hadoop.version>0.23.10</hadoop.version> + </properties> + </profile> + + <profile> + <id>hadoop-1</id> + <properties> + <hadoop.version>1.0.4</hadoop.version> + <avro.mapred.classifier>hadoop1</avro.mapred.classifier> + <codehaus.jackson.version>1.8.8</codehaus.jackson.version> + <akka.group>org.spark-project.akka</akka.group> + </properties> + </profile> + + <profile> + <id>hadoop-2.2</id> + <properties> + <hadoop.version>2.2.0</hadoop.version> + <protobuf.version>2.5.0</protobuf.version> + <avro.mapred.classifier>hadoop2</avro.mapred.classifier> + </properties> + </profile> + + <profile> + <id>hadoop-2.3</id> + <properties> + <hadoop.version>2.3.0</hadoop.version> + <protobuf.version>2.5.0</protobuf.version> + <jets3t.version>0.9.3</jets3t.version> + <avro.mapred.classifier>hadoop2</avro.mapred.classifier> + </properties> + </profile> + + <profile> + <id>hadoop-2.4</id> + <properties> + <hadoop.version>2.4.0</hadoop.version> + <protobuf.version>2.5.0</protobuf.version> + <jets3t.version>0.9.3</jets3t.version> + <avro.mapred.classifier>hadoop2</avro.mapred.classifier> + </properties> + </profile> + + <profile> + <id>hadoop-2.6</id> + <properties> + <hadoop.version>2.6.0</hadoop.version> + <protobuf.version>2.5.0</protobuf.version> + <jets3t.version>0.9.3</jets3t.version> + <avro.mapred.classifier>hadoop2</avro.mapred.classifier> + </properties> + </profile> + + <profile> + <id>hadoop-2.7</id> + <properties> + <hadoop.version>2.7.2</hadoop.version> + <protobuf.version>2.5.0</protobuf.version> + <jets3t.version>0.9.0</jets3t.version> + <avro.mapred.classifier>hadoop2</avro.mapred.classifier> + </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> + <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> <build> @@ -453,36 +956,21 @@ <directory>src/main/sparkr-resources</directory> </resource> </resources> - </build> - </profile> - <profile> - <id>exclude-sparkr</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <excludes> - <exclude>**/SparkRInterpreter.java</exclude> - </excludes> - <testExcludes> - <testExclude>**/SparkRInterpreterTest.java</testExclude> - <testExclude>**/ZeppelinRTest.java</testExclude> - </testExcludes> + <excludes combine.self="override"></excludes> + <testExcludes combine.self="override"></testExcludes> </configuration> </plugin> <plugin> <groupId>org.scala-tools</groupId> <artifactId>maven-scala-plugin</artifactId> <configuration> - <excludes> - <exclude>**/ZeppelinR.scala</exclude> - <exclude>**/SparkRBackend.scala</exclude> + <excludes combine.self="override"> </excludes> </configuration> </plugin> @@ -490,8 +978,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <exclude>**/SparkRInterpreterTest.java</exclude> + <excludes combine.self="override"> </excludes> </configuration> </plugin>
