Author: tucu
Date: Wed Aug 14 22:25:26 2013
New Revision: 1514071
URL: http://svn.apache.org/r1514071
Log:
HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml?rev=1514071&r1=1514070&r2=1514071&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml Wed
Aug 14 22:25:26 2013
@@ -412,6 +412,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
+ <protocVersion>2.5.0</protocVersion>
<imports>
<param>${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto</param>
<param>${basedir}/src/main/proto</param>
@@ -436,6 +437,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
+ <protocVersion>2.5.0</protocVersion>
<imports>
<param>${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto</param>
<param>${basedir}/src/main/proto</param>
@@ -457,6 +459,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
+ <protocVersion>2.5.0</protocVersion>
<imports>
<param>${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto</param>
<param>${basedir}/src/main/proto</param>
@@ -478,6 +481,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
+ <protocVersion>2.5.0</protocVersion>
<imports>
<param>${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto</param>
<param>${basedir}/src/main/proto</param>
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml?rev=1514071&r1=1514070&r2=1514071&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
Wed Aug 14 22:25:26 2013
@@ -103,6 +103,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
+ <protocVersion>2.5.0</protocVersion>
<imports>
<param>${basedir}/../../../../../hadoop-common-project/hadoop-common/src/main/proto</param>
<param>${basedir}/../../../../../hadoop-hdfs-project/hadoop-hdfs/src/main/proto</param>
