Skip to content

Commit

Permalink
Revert "[SPARK-7042] [BUILD] use the standard akka artifacts with had…
Browse files Browse the repository at this point in the history
…oop-2.x"

This reverts commit 43aa819.
  • Loading branch information
pwendell committed May 26, 2015
1 parent 6309912 commit b7d8085
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<akka.group>com.typesafe.akka</akka.group>
<akka.version>2.3.4</akka.version>
<akka.group>org.spark-project.akka</akka.group>
<akka.version>2.3.4-spark</akka.version>
<java.version>1.6</java.version>
<sbt.project.name>spark</sbt.project.name>
<scala.macros.version>2.0.1</scala.macros.version>
Expand Down Expand Up @@ -1664,8 +1664,6 @@
<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>

Expand Down

0 comments on commit b7d8085

Please sign in to comment.