From 1d72a30874a88bdbab75217f001cf2af409016e7 Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Fri, 10 Oct 2014 16:49:19 -0700
Subject: [PATCH] HOTFIX: Fix build issue with Akka 2.3.4 upgrade.
We had to upgrade our Hive 0.12 version as well to deal with a protobuf
conflict (both hive and akka have been using a shaded protobuf version).
This is testing a correctly patched version of Hive 0.12.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #2756 from pwendell/hotfix and squashes the following commits:
cc979d0 [Patrick Wendell] HOTFIX: Fix build issue with Akka 2.3.4 upgrade.
---
pom.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d047b9e307..288bbf1114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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-protobuf</hive.version>
+ <hive.version>0.12.0-protobuf-2.5</hive.version>
<parquet.version>1.4.3</parquet.version>
<jblas.version>1.2.3</jblas.version>
<jetty.version>8.1.14.v20131031</jetty.version>
@@ -223,6 +223,18 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <!-- This is temporarily included to fix issues with Hive 0.12 -->
+ <id>spark-staging</id>
+ <name>Spring Staging Repository</name>
+ <url>https://oss.sonatype.org/content/repositories/orgspark-project-1085</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
--
GitLab