From 70661246fd5d3f3daa90404728b4e98acf57e11d Mon Sep 17 00:00:00 2001 From: Jey Kottalam Date: Fri, 6 Sep 2013 10:35:06 -0700 Subject: Fix YARN assembly generation under Maven --- pom.xml | 218 +++++++++++++++++++++++++++------------------------------------- 1 file changed, 93 insertions(+), 125 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index c561b099ab..5c1f9f0324 100644 --- a/pom.xml +++ b/pom.xml @@ -368,6 +368,99 @@ + + org.apache.hadoop + hadoop-yarn-api + ${hadoop.version} + + + asm + asm + + + org.jboss.netty + netty + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + + + org.apache.hadoop + hadoop-yarn-common + ${hadoop.version} + + + asm + asm + + + org.jboss.netty + netty + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + + + org.apache.hadoop + hadoop-yarn-client + ${hadoop.version} + + + asm + asm + + + org.jboss.netty + netty + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.apache.avro @@ -620,131 +713,6 @@ - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - - - asm - asm - - - org.jboss.netty - netty - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - - - org.apache.hadoop - hadoop-yarn-api - ${hadoop.version} - - - asm - asm - - - org.jboss.netty - netty - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - - - org.apache.hadoop - hadoop-yarn-common - ${hadoop.version} - - - asm - asm - - - org.jboss.netty - netty - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - - - org.apache.hadoop - hadoop-yarn-client - ${hadoop.version} - - - asm - asm - - - org.jboss.netty - netty - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-jaxrs - - - org.codehaus.jackson - jackson-xc - - - -- cgit v1.2.3 From 528fdbae97e58797f62d97f27527092c0a5fed42 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 9 Sep 2013 09:32:18 -0700 Subject: Adding Manen dependency --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index c561b099ab..c747822129 100644 --- a/pom.xml +++ b/pom.xml @@ -286,6 +286,11 @@ metrics-json 3.0.0 + + com.codahale.metrics + metrics-ganglia + 3.0.0 + org.scala-lang scala-compiler -- cgit v1.2.3 From f117dc6d0d1349c28b7e1c8cf7729d1aafde5d25 Mon Sep 17 00:00:00 2001 From: Matei Zaharia Date: Tue, 10 Sep 2013 06:39:25 +0000 Subject: Add explicit jets3t dependency, which is excluded in hadoop-client --- core/pom.xml | 5 +++++ pom.xml | 5 +++++ project/SparkBuild.scala | 1 + 3 files changed, 11 insertions(+) (limited to 'pom.xml') diff --git a/core/pom.xml b/core/pom.xml index b5c5194524..14cd520aaf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -36,6 +36,11 @@ org.apache.hadoop hadoop-client + + net.java.dev.jets3t + jets3t + 0.7.1 + org.apache.avro avro diff --git a/pom.xml b/pom.xml index d05449ebd8..bb03a92de8 100644 --- a/pom.xml +++ b/pom.xml @@ -373,6 +373,11 @@ + + net.java.dev.jets3t + jets3t + 0.7.1 + org.apache.hadoop hadoop-yarn-api diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index a60b553b5a..087c6d8a8d 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -208,6 +208,7 @@ object SparkBuild extends Build { "io.netty" % "netty-all" % "4.0.0.Beta2", "org.apache.derby" % "derby" % "10.4.2.0" % "test", "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), + "net.java.dev.jets3t" % "jets3t" % "0.7.1", "org.apache.avro" % "avro" % "1.7.4", "org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty), "com.codahale.metrics" % "metrics-core" % "3.0.0", -- cgit v1.2.3 From 45ec1cc90e25a82ffab587feeb419132efd1b9a1 Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Thu, 12 Sep 2013 13:47:09 -0700 Subject: Add git scm url for publishing --- pom.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index bb03a92de8..7bacbb1fa8 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ scm:git:git@github.com:apache/incubator-spark.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git scm:git:git@github.com:apache/incubator-spark.git -- cgit v1.2.3 From e9eba8c3ce320364f20dbbb19e42df07f936214f Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Fri, 13 Sep 2013 14:06:45 -0700 Subject: Use different Hadoop version for YARN artifacts. This uses a seperate Hadoop version for YARN artifact. This means when people link against spark-yarn, things will resolve correctly. --- pom.xml | 11 ++++++----- yarn/pom.xml | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 7bacbb1fa8..2da016a88a 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,7 @@ 1.7.2 1.2.17 1.0.4 + 0.23.7 0.94.6 64m @@ -382,7 +383,7 @@ org.apache.hadoop hadoop-yarn-api - ${hadoop.version} + ${yarn.version} asm @@ -413,7 +414,7 @@ org.apache.hadoop hadoop-yarn-common - ${hadoop.version} + ${yarn.version} asm @@ -444,7 +445,7 @@ org.apache.hadoop hadoop-yarn-client - ${hadoop.version} + ${yarn.version} asm @@ -700,8 +701,8 @@ 2 - - 2.0.5-alpha + 0.23.7 + diff --git a/yarn/pom.xml b/yarn/pom.xml index 27b2002095..21b650d1ea 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -48,6 +48,11 @@ org.apache.hadoop hadoop-yarn-client + + org.apache.hadoop + hadoop-client + ${yarn.version} + org.apache.avro avro -- cgit v1.2.3 From c856860c5b4b0e3ef6f8e23d72d1d0069e3a56bf Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Sun, 15 Sep 2013 12:46:26 -0700 Subject: Bumping Mesos version to 0.13.0 --- docs/_config.yml | 2 +- pom.xml | 2 +- project/SparkBuild.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pom.xml') diff --git a/docs/_config.yml b/docs/_config.yml index 5c135a0242..b061764b36 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -6,5 +6,5 @@ markdown: kramdown SPARK_VERSION: 0.8.0-SNAPSHOT SPARK_VERSION_SHORT: 0.8.0 SCALA_VERSION: 2.9.3 -MESOS_VERSION: 0.9.0-incubating +MESOS_VERSION: 0.13.0 SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net diff --git a/pom.xml b/pom.xml index 2da016a88a..4aed1260f0 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 1.5 2.9.3 - 0.12.1 + 0.13.0 2.0.5 1.7.2 1.2.17 diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 77e211ce03..ed7671757b 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -204,7 +204,7 @@ object SparkBuild extends Build { "it.unimi.dsi" % "fastutil" % "6.4.4", "colt" % "colt" % "1.2.0", "net.liftweb" % "lift-json_2.9.2" % "2.5", - "org.apache.mesos" % "mesos" % "0.12.1", + "org.apache.mesos" % "mesos" % "0.13.0", "io.netty" % "netty-all" % "4.0.0.Beta2", "org.apache.derby" % "derby" % "10.4.2.0" % "test", "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), -- cgit v1.2.3