Skip to content

Commit

Permalink
HOTFIX: Fix build issue with Akka 2.3.4 upgrade.
Browse files Browse the repository at this point in the history
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 <[email protected]>

Closes apache#2756 from pwendell/hotfix and squashes the following commits:

cc979d0 [Patrick Wendell] HOTFIX: Fix build issue with Akka 2.3.4 upgrade.
  • Loading branch information
pwendell committed Oct 10, 2014
1 parent 72f36ee commit 1d72a30
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 1d72a30

Please sign in to comment.