You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/06/07 14:41:05 UTC
spark git commit: [SPARK-7042] [BUILD] use the standard akka
artifacts with hadoop-2.x
Repository: spark
Updated Branches:
refs/heads/master 8c321d66d -> ca8dafcc9
[SPARK-7042] [BUILD] use the standard akka artifacts with hadoop-2.x
Both akka 2.3.x and hadoop-2.x use protobuf 2.5 so only hadoop-1 build needs
custom 2.3.4-spark akka version that shades protobuf-2.5
This change also updates akka version (for hadoop-2.x profiles only) to the
latest 2.3.11 as akka-zeromq_2.11 is not available for akka 2.3.4.
This partially fixes SPARK-7042 (for hadoop-2.x builds)
Author: Konstantin Shaposhnikov <Ko...@sc.com>
Closes #6492 from kostya-sh/SPARK-7042 and squashes the following commits:
dc195b0 [Konstantin Shaposhnikov] [SPARK-7042] [BUILD] use the standard akka artifacts with hadoop-2.x
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ca8dafcc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ca8dafcc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ca8dafcc
Branch: refs/heads/master
Commit: ca8dafcc9fa661f05da9c98104d987716aa5f5eb
Parents: 8c321d6
Author: Konstantin Shaposhnikov <Ko...@sc.com>
Authored: Sun Jun 7 13:41:00 2015 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Sun Jun 7 13:41:00 2015 +0100
----------------------------------------------------------------------
pom.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ca8dafcc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e28d4b9..e65448e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,8 +114,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <akka.group>org.spark-project.akka</akka.group>
- <akka.version>2.3.4-spark</akka.version>
+ <akka.group>com.typesafe.akka</akka.group>
+ <akka.version>2.3.11</akka.version>
<java.version>1.6</java.version>
<sbt.project.name>spark</sbt.project.name>
<mesos.version>0.21.1</mesos.version>
@@ -1670,6 +1670,8 @@
<hbase.version>0.98.7-hadoop1</hbase.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>
+ <akka.version>2.3.4-spark</akka.version>
</properties>
</profile>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org