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 konstantin.shaposhni...@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 konstantin.shaposhni...@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.sourceEncodingUTF-8/project.build.sourceEncoding project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding -akka.grouporg.spark-project.akka/akka.group -akka.version2.3.4-spark/akka.version +akka.groupcom.typesafe.akka/akka.group +akka.version2.3.11/akka.version java.version1.6/java.version sbt.project.namespark/sbt.project.name mesos.version0.21.1/mesos.version @@ -1670,6 +1670,8 @@ hbase.version0.98.7-hadoop1/hbase.version avro.mapred.classifierhadoop1/avro.mapred.classifier codehaus.jackson.version1.8.8/codehaus.jackson.version +akka.grouporg.spark-project.akka/akka.group +akka.version2.3.4-spark/akka.version /properties /profile - To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [SPARK-7042] [BUILD] use the standard akka artifacts with hadoop-2.x
Repository: spark Updated Branches: refs/heads/master c9adcad81 - 43aa819c0 [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 partially fixes SPARK-7042 (for hadoop-2.x builds) Author: Konstantin Shaposhnikov konstantin.shaposhni...@sc.com Closes #6341 from kostya-sh/SPARK-7042 and squashes the following commits: 7eb8c60 [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/43aa819c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/43aa819c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/43aa819c Branch: refs/heads/master Commit: 43aa819c041f6e8301ad1b8f82eb68e14254f636 Parents: c9adcad Author: Konstantin Shaposhnikov konstantin.shaposhni...@sc.com Authored: Tue May 26 07:49:32 2015 +0100 Committer: Sean Owen so...@cloudera.com Committed: Tue May 26 07:49:32 2015 +0100 -- pom.xml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/spark/blob/43aa819c/pom.xml -- diff --git a/pom.xml b/pom.xml index c72d7cb..8e936ab 100644 --- a/pom.xml +++ b/pom.xml @@ -114,8 +114,8 @@ properties project.build.sourceEncodingUTF-8/project.build.sourceEncoding project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding -akka.grouporg.spark-project.akka/akka.group -akka.version2.3.4-spark/akka.version +akka.groupcom.typesafe.akka/akka.group +akka.version2.3.4/akka.version java.version1.6/java.version sbt.project.namespark/sbt.project.name scala.macros.version2.0.1/scala.macros.version @@ -1664,6 +1664,8 @@ hbase.version0.98.7-hadoop1/hbase.version avro.mapred.classifierhadoop1/avro.mapred.classifier codehaus.jackson.version1.8.8/codehaus.jackson.version +akka.grouporg.spark-project.akka/akka.group +akka.version2.3.4-spark/akka.version /properties /profile - To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
