aboutsummaryrefslogtreecommitdiff
path: root/pom.xml
diff options
context:
space:
mode:
authorAnand Avati <avati@redhat.com>2014-10-10 00:46:56 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-10-10 00:46:56 -0700
commit411cf29fff011561f0093bb6101af87842828369 (patch)
tree3f931b9a0c929ff45c8e3a6329422780f10b6130 /pom.xml
parent6f98902a3d7749e543bc493a8c62b1e3a7b924cc (diff)
downloadspark-411cf29fff011561f0093bb6101af87842828369.tar.gz
spark-411cf29fff011561f0093bb6101af87842828369.tar.bz2
spark-411cf29fff011561f0093bb6101af87842828369.zip
[SPARK-2805] Upgrade Akka to 2.3.4
This is a second rev of the Akka upgrade (earlier merged, but reverted). I made a slight modification which is that I also upgrade Hive to deal with a compatibility issue related to the protocol buffers library. Author: Anand Avati <avati@redhat.com> Author: Patrick Wendell <pwendell@gmail.com> Closes #2752 from pwendell/akka-upgrade and squashes the following commits: 4c7ca3f [Patrick Wendell] Upgrading to new hive->protobuf version 57a2315 [Anand Avati] SPARK-1812: streaming - remove tests which depend on akka.actor.IO 2a551d3 [Anand Avati] SPARK-1812: core - upgrade to akka 2.3.4
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 7756c89b00..d047b9e307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
<mesos.version>0.18.1</mesos.version>
<mesos.classifier>shaded-protobuf</mesos.classifier>
<akka.group>org.spark-project.akka</akka.group>
- <akka.version>2.2.3-shaded-protobuf</akka.version>
+ <akka.version>2.3.4-spark</akka.version>
<slf4j.version>1.7.5</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<hadoop.version>1.0.4</hadoop.version>
@@ -127,7 +127,7 @@
<hbase.version>0.94.6</hbase.version>
<flume.version>1.4.0</flume.version>
<zookeeper.version>3.4.5</zookeeper.version>
- <hive.version>0.12.0</hive.version>
+ <hive.version>0.12.0-protobuf</hive.version>
<parquet.version>1.4.3</parquet.version>
<jblas.version>1.2.3</jblas.version>
<jetty.version>8.1.14.v20131031</jetty.version>