You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by tu...@apache.org on 2013/08/13 00:15:11 UTC

svn commit: r1513281 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml

Author: tucu
Date: Mon Aug 12 22:15:10 2013
New Revision: 1513281

URL: http://svn.apache.org/r1513281
Log:
HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)

Modified:
    hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1513281&r1=1513280&r2=1513281&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Aug 12 22:15:10 2013
@@ -105,6 +105,8 @@ Trunk (Unreleased)
 
     HADOOP-9833 move slf4j to version 1.7.5 (Kousuke Saruta via stevel)
 
+    HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)
+
   BUG FIXES
 
     HADOOP-9451. Fault single-layer config if node group topology is enabled.

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml?rev=1513281&r1=1513280&r2=1513281&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Mon Aug 12 22:15:10 2013
@@ -308,6 +308,7 @@
               <goal>protoc</goal>
             </goals>
             <configuration>
+              <protocVersion>${protobuf.version}</protocVersion>
               <imports>
                 <param>${basedir}/src/main/proto</param>
               </imports>
@@ -336,6 +337,7 @@
               <goal>protoc</goal>
             </goals>
             <configuration>
+              <protocVersion>${protobuf.version}</protocVersion>
               <imports>
                 <param>${basedir}/src/test/proto</param>
               </imports>