tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject git commit: TEZ-363. Move to protobuf 2.5.0. Contributed by Hitesh Shah.
Date Fri, 16 Aug 2013 01:03:40 GMT
Updated Branches:
  refs/heads/master 15a411e71 -> 883bc3626


TEZ-363. Move to protobuf 2.5.0. Contributed by Hitesh Shah.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/883bc362
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/883bc362
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/883bc362

Branch: refs/heads/master
Commit: 883bc36267cab1f7560604fcc502de5f38ae51bd
Parents: 15a411e
Author: Siddharth Seth <sseth@apache.org>
Authored: Thu Aug 15 18:03:08 2013 -0700
Committer: Siddharth Seth <sseth@apache.org>
Committed: Thu Aug 15 18:03:08 2013 -0700

----------------------------------------------------------------------
 pom.xml             | 4 +++-
 tez-dag-api/pom.xml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/883bc362/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 04c6793..5d18af9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,8 @@
     <distMgmtStagingName>Apache Release Distribution Repository</distMgmtStagingName>
     <distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
     <failIfNoTests>false</failIfNoTests>
+    <protobuf.version>2.5.0</protobuf.version>
+    <protoc.path>${env.PROTOC_PATH}</protoc.path>
   </properties>
 
   <distributionManagement>
@@ -231,7 +233,7 @@
       <dependency>
        <groupId>com.google.protobuf</groupId>
        <artifactId>protobuf-java</artifactId>
-       <version>2.4.0a</version>
+       <version>${protobuf.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/883bc362/tez-dag-api/pom.xml
----------------------------------------------------------------------
diff --git a/tez-dag-api/pom.xml b/tez-dag-api/pom.xml
index 12f04de..107b0fa 100644
--- a/tez-dag-api/pom.xml
+++ b/tez-dag-api/pom.xml
@@ -61,6 +61,8 @@
               <goal>protoc</goal>
             </goals>
             <configuration>
+              <protocVersion>${protobuf.version}</protocVersion>
+              <protocCommand>${protoc.path}</protocCommand>
               <imports>
                 <param>${basedir}/src/main/proto</param>
               </imports>


Mime
View raw message