Repository: incubator-zeppelin Updated Branches: refs/heads/branch-0.5 da3ef060a -> a4fc928d7
ZEPPELIN-123 bringing hadoop-1 profile for spark interpreter module Bringing hadoop-1 profile for Spark interpreter module https://issues.apache.org/jira/browse/ZEPPELIN-123 Author: Lee moon soo <[email protected]> Closes #111 from Leemoonsoo/ZEPPELIN-123 and squashes the following commits: c573f1e [Lee moon soo] Set proper akka.group and akka.version c14f6bb [Lee moon soo] Manage dependencies version more like spark does 983aa54 [Lee moon soo] force jets3t.version for hadoop-1 profile 320c64f [Lee moon soo] ZEPPELIN-123 bringing hadoop-1 profile for spark (cherry picked from commit 971e763cd7bbce73ed63f444b28011ea2da851bb) Signed-off-by: Lee moon soo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/a4fc928d Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/a4fc928d Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/a4fc928d Branch: refs/heads/branch-0.5 Commit: a4fc928d7fce1688576f87b41cefd0da99a42883 Parents: da3ef06 Author: Lee moon soo <[email protected]> Authored: Tue Jun 23 15:46:56 2015 -0700 Committer: Lee moon soo <[email protected]> Committed: Wed Jun 24 13:30:10 2015 -0700 ---------------------------------------------------------------------- spark/pom.xml | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a4fc928d/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index ae9e52d..ea468bb 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -41,7 +41,13 @@ <hadoop.version>2.3.0</hadoop.version> <yarn.version>${hadoop.version}</yarn.version> - <jets3t.version>0.9.3</jets3t.version> + <avro.version>1.7.7</avro.version> + <avro.mapred.classifier></avro.mapred.classifier> + <jets3t.version>0.7.1</jets3t.version> + <protobuf.version>2.4.1</protobuf.version> + + <akka.group>org.spark-project.akka</akka.group> + <akka.version>2.3.4-spark</akka.version> </properties> <repositories> @@ -53,6 +59,67 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>${avro.version}</version> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro-ipc</artifactId> + <version>${avro.version}</version> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro-mapred</artifactId> + <version>${avro.version}</version> + <classifier>${avro.mapred.classifier}</classifier> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- See SPARK-1556 for info on this dependency: --> <dependency> <groupId>net.java.dev.jets3t</groupId> @@ -254,6 +321,44 @@ </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.version}</version> + </dependency> + + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-actor_${scala.binary.version}</artifactId> + <version>${akka.version}</version> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-remote_${scala.binary.version}</artifactId> + <version>${akka.version}</version> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-slf4j_${scala.binary.version}</artifactId> + <version>${akka.version}</version> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-testkit_${scala.binary.version}</artifactId> + <version>${akka.version}</version> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-zeromq_${scala.binary.version}</artifactId> + <version>${akka.version}</version> + <exclusions> + <exclusion> + <groupId>${akka.group}</groupId> + <artifactId>akka-actor_${scala.binary.version}</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- Aether :: maven dependency resolution --> <dependency> <groupId>org.apache.maven</groupId> @@ -396,6 +501,7 @@ </dependencies> <properties> <spark.version>1.1.1</spark.version> + <akka.version>2.2.3-shaded-protobuf</akka.version> </properties> </profile> @@ -416,6 +522,7 @@ </dependencies> <properties> <spark.version>1.1.1</spark.version> + <akka.version>2.2.3-shaded-protobuf</akka.version> </properties> </profile> @@ -505,7 +612,16 @@ </dependencies> <properties> <hadoop.version>0.23.10</hadoop.version> - <jets3t.version>0.7.1</jets3t.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> @@ -513,7 +629,8 @@ <id>hadoop-2.2</id> <properties> <hadoop.version>2.2.0</hadoop.version> - <jets3t.version>0.7.1</jets3t.version> + <protobuf.version>2.5.0</protobuf.version> + <avro.mapred.classifier>hadoop2</avro.mapred.classifier> </properties> </profile> @@ -521,6 +638,9 @@ <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> @@ -528,6 +648,9 @@ <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> @@ -535,6 +658,9 @@ <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>
