From b7d8085942c564d6c5b81a14d31789e1b215e62b Mon Sep 17 00:00:00 2001
From: Patrick Wendell <patrick@databricks.com>
Date: Tue, 26 May 2015 10:05:13 -0700
Subject: Revert "[SPARK-7042] [BUILD] use the standard akka artifacts with
 hadoop-2.x"

This reverts commit 43aa819c041f6e8301ad1b8f82eb68e14254f636.
---
 pom.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 8e936ab5ab..c72d7cbf84 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>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>
@@ -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>
 
-- 
cgit v1.2.3