diff options
| author | Konstantin Shaposhnikov <Konstantin.Shaposhnikov@sc.com> | 2015-05-26 07:49:32 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-05-26 07:49:32 +0100 |
| commit | 43aa819c041f6e8301ad1b8f82eb68e14254f636 (patch) | |
| tree | bee7f7d20172bdd5a93edb0311e10290f007f12c /pom.xml | |
| parent | c9adcad81a493595d075715efb2ae395d88a9ec2 (diff) | |
| download | spark-43aa819c041f6e8301ad1b8f82eb68e14254f636.tar.gz spark-43aa819c041f6e8301ad1b8f82eb68e14254f636.tar.bz2 spark-43aa819c041f6e8301ad1b8f82eb68e14254f636.zip | |
[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.Shaposhnikov@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
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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.4</akka.version> <java.version>1.6</java.version> <sbt.project.name>spark</sbt.project.name> <scala.macros.version>2.0.1</scala.macros.version> @@ -1664,6 +1664,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> |