svn commit: r1521520 [1/2] - in /hive/trunk: build.properties hcatalog/pom.xml ivy/libraries.properties ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/OrcProto.java

[ha...@apache.org]

Author: hashutosh
Date: Tue Sep 10 15:08:29 2013
New Revision: 1521520

URL: http://svn.apache.org/r1521520
Log:
HIVE-5112 : Upgrade protobuf to 2.5 from 2.4 (Owen O'malley and Brock Noland via Ashutosh Chauhan)

Modified:
    hive/trunk/build.properties
    hive/trunk/hcatalog/pom.xml
    hive/trunk/ivy/libraries.properties
    hive/trunk/ql/src/gen/protobuf/gen-java/org/apache/hadoop/hive/ql/io/orc/OrcProto.java

Modified: hive/trunk/build.properties
URL: http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1521520&r1=1521519&r2=1521520&view=diff
==============================================================================
--- hive/trunk/build.properties (original)
+++ hive/trunk/build.properties Tue Sep 10 15:08:29 2013
@@ -28,7 +28,7 @@ javac.args.warnings=
 
 hadoop-0.20.version=0.20.2
 hadoop-0.20S.version=1.1.2
-hadoop-0.23.version=2.0.5-alpha
+hadoop-0.23.version=2.1.0-beta
 hadoop.version=${hadoop-0.20.version}
 hadoop.security.version=${hadoop-0.20S.version}
 # Used to determine which set of Hadoop artifacts we depend on.

Modified: hive/trunk/hcatalog/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/pom.xml?rev=1521520&r1=1521519&r2=1521520&view=diff
==============================================================================
--- hive/trunk/hcatalog/pom.xml (original)
+++ hive/trunk/hcatalog/pom.xml Tue Sep 10 15:08:29 2013
@@ -27,7 +27,7 @@
       <commons-io.version>2.4</commons-io.version>
       <guava.version>11.0.2</guava.version>
       <hadoop20.version>1.0.3</hadoop20.version>
-      <hadoop23.version>2.0.3-alpha</hadoop23.version>
+      <hadoop23.version>2.1.0-beta</hadoop23.version>
       <hbase.version>0.94.5</hbase.version>
       <hcatalog.version>${project.version}</hcatalog.version>
       <hive.version>${project.version}</hive.version>

Modified: hive/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/trunk/ivy/libraries.properties?rev=1521520&r1=1521519&r2=1521520&view=diff
==============================================================================
--- hive/trunk/ivy/libraries.properties (original)
+++ hive/trunk/ivy/libraries.properties Tue Sep 10 15:08:29 2013
@@ -57,7 +57,7 @@ libthrift.version=0.9.0
 log4j.version=1.2.16
 maven-ant-tasks.version=2.1.0
 mockito-all.version=1.8.2
-protobuf.version=2.4.1
+protobuf.version=2.5.0
 rat.version=0.8
 slf4j-api.version=1.6.1
 slf4j-log4j12.version=1.6.1