Repository: spark Updated Branches: refs/heads/master 72f36ee57 -> 1d72a3087
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 <[email protected]> Closes #2756 from pwendell/hotfix and squashes the following commits: cc979d0 [Patrick Wendell] HOTFIX: Fix build issue with Akka 2.3.4 upgrade. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1d72a308 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1d72a308 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1d72a308 Branch: refs/heads/master Commit: 1d72a30874a88bdbab75217f001cf2af409016e7 Parents: 72f36ee Author: Patrick Wendell <[email protected]> Authored: Fri Oct 10 16:49:19 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Fri Oct 10 16:49:19 2014 -0700 ---------------------------------------------------------------------- pom.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1d72a308/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d047b9e..288bbf1 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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
