Updated Branches: refs/heads/branch-0.8 d61494588 -> d03589de7
Fix POM file for mvn assembly on hadoop 2.2 Yarn Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/e468f811 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/e468f811 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/e468f811 Branch: refs/heads/branch-0.8 Commit: e468f81164887a612377caedb398d102b3acdf50 Parents: 216b473 Author: Raymond Liu <[email protected]> Authored: Tue Dec 10 13:30:57 2013 +0800 Committer: Raymond Liu <[email protected]> Committed: Tue Dec 10 13:30:57 2013 +0800 ---------------------------------------------------------------------- assembly/pom.xml | 28 ++++++++++ examples/pom.xml | 17 ++++++ new-yarn/pom.xml | 18 ++++++- pom.xml | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++ repl-bin/pom.xml | 12 +++++ repl/pom.xml | 12 +++++ yarn/pom.xml | 17 ++++++ 7 files changed, 243 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e468f811/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 361a1d8..e7d923c 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -40,6 +40,23 @@ <dependencies> <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-actor</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-remote</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-slf4j</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-zeromq</artifactId> + </dependency> + + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.9.3</artifactId> <version>${project.version}</version> @@ -134,6 +151,17 @@ </dependencies> </profile> <profile> + <id>new-yarn</id> + <dependencies> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-yarn_2.9.3</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </profile> + + <profile> <id>bigtop-dist</id> <!-- This profile uses the assembly plugin to create a special "dist" package for BigTop that contains Spark but not the Hadoop JARs it depends on. --> http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e468f811/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index d12e3ab..5683d40 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -41,6 +41,23 @@ <dependencies> <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-actor</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-remote</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-slf4j</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-zeromq</artifactId> + </dependency> + + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.9.3</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e468f811/new-yarn/pom.xml ---------------------------------------------------------------------- diff --git a/new-yarn/pom.xml b/new-yarn/pom.xml index d9168e3..3310f04 100644 --- a/new-yarn/pom.xml +++ b/new-yarn/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>0.8.1-incubating-SNAPSHOT</version> + <version>0.8.2-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -32,6 +32,22 @@ <dependencies> <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-actor</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-remote</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-slf4j</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-zeromq</artifactId> + </dependency> + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.9.3</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e468f811/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 53f576c..dbff1be 100644 --- a/pom.xml +++ b/pom.xml @@ -189,6 +189,146 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-core_2.9.3</artifactId> + <version>${project.version}</version> + <!-- Work around for akka override --> + <exclusions> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-actor</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-remote</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-zeromq</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-bagel_2.9.3</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-actor</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-remote</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-zeromq</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-mllib_2.9.3</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-actor</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-remote</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-zeromq</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-repl_2.9.3</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-actor</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-remote</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-zeromq</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-streaming_2.9.3</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-actor</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-remote</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-zeromq</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-yarn_2.9.3</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-actor</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-remote</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-zeromq</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>7.6.8.v20121106</version> http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e468f811/repl-bin/pom.xml ---------------------------------------------------------------------- diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 6f14fe8..d6aa47a 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -39,6 +39,18 @@ <dependencies> <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-actor</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-remote</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-slf4j</artifactId> + </dependency> + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.9.3</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e468f811/repl/pom.xml ---------------------------------------------------------------------- diff --git a/repl/pom.xml b/repl/pom.xml index 7a59d89..b7dbff7 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -38,6 +38,18 @@ <dependencies> <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-actor</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-remote</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-slf4j</artifactId> + </dependency> + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.9.3</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e468f811/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/pom.xml b/yarn/pom.xml index 002c731..04934aa 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -32,6 +32,23 @@ <dependencies> <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-actor</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-remote</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-slf4j</artifactId> + </dependency> + <dependency> + <groupId>${akka.group}</groupId> + <artifactId>akka-zeromq</artifactId> + </dependency> + + <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.9.3</artifactId> <version>${project.version}</version>
