Author: tucu Date: Wed Aug 14 22:49:55 2013 New Revision: 1514082 URL: http://svn.apache.org/r1514082 Log: HADOOP-9872. Improve protoc version handling and detection. (tucu)
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml?rev=1514082&r1=1514081&r2=1514082&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml (original) +++ hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml Wed Aug 14 22:49:55 2013 @@ -64,7 +64,8 @@ <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-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto</param>