Author: tucu
Date: Wed Aug 14 22:29:46 2013
New Revision: 1514074
URL: http://svn.apache.org/r1514074
Log:
HADOOP-9872. Improve protoc version handling and detection. (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=1514074&r1=1514073&r2=1514074&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:29:46 2013
@@ -412,7 +412,8 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
- <protocVersion>2.5.0</protocVersion>
+ <protocVersion>${protobuf.version}</protocVersion>
+ <protocCommand>${protoc.path}</protocCommand>
<imports>
<param>${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto</param>
<param>${basedir}/src/main/proto</param>
@@ -437,7 +438,8 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
- <protocVersion>2.5.0</protocVersion>
+ <protocVersion>${protobuf.version}</protocVersion>
+ <protocCommand>${protoc.path}</protocCommand>
<imports>
<param>${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto</param>
<param>${basedir}/src/main/proto</param>
@@ -459,7 +461,8 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
- <protocVersion>2.5.0</protocVersion>
+ <protocVersion>${protobuf.version}</protocVersion>
+ <protocCommand>${protoc.path}</protocCommand>
<imports>
<param>${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto</param>
<param>${basedir}/src/main/proto</param>
@@ -481,7 +484,8 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
- <protocVersion>2.5.0</protocVersion>
+ <protocVersion>${protobuf.version}</protocVersion>
+ <protocCommand>${protoc.path}</protocCommand>
<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=1514074&r1=1514073&r2=1514074&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:29:46 2013
@@ -103,7 +103,8 @@ http://maven.apache.org/xsd/maven-4.0.0.
<goal>protoc</goal>
</goals>
<configuration>
- <protocVersion>2.5.0</protocVersion>
+ <protocVersion>${protobuf.version}</protocVersion>
+ <protocCommand>${protoc.path}</protocCommand>
<imports>
<param>${basedir}/../../../../../hadoop-common-project/hadoop-common/src/main/proto</param>
<param>${basedir}/../../../../../hadoop-hdfs-project/hadoop-hdfs/src/main/proto</param>
