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-hdfs-project/hadoop-hdfs/pom.xml hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/pom.xml?rev=1513281&r1=1513280&r2=1513281&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/pom.xml (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/pom.xml Mon Aug 12 22:15:10 2013 @@ -417,6 +417,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> @@ -441,6 +442,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> @@ -462,6 +464,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> @@ -483,6 +486,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/trunk/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml?rev=1513281&r1=1513280&r2=1513281&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml Mon Aug 12 22:15:10 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>