You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by yo...@apache.org on 2019/01/02 11:56:21 UTC

incubator-omid git commit: [OMID-122] Allow specifying the path of the protoc executable

Repository: incubator-omid
Updated Branches:
  refs/heads/1.0.1 c010f7509 -> 6344cb59a


[OMID-122] Allow specifying the path of the protoc executable


Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/6344cb59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/6344cb59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/6344cb59

Branch: refs/heads/1.0.1
Commit: 6344cb59aa9906dc20248eed92d3439d2cecd3d7
Parents: c010f75
Author: Yonatan Gottesman <yo...@gmail.com>
Authored: Wed Jan 2 13:55:53 2019 +0200
Committer: Yonatan Gottesman <yo...@gmail.com>
Committed: Wed Jan 2 13:55:53 2019 +0200

----------------------------------------------------------------------
 common/pom.xml | 2 +-
 pom.xml        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/6344cb59/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 96c462c..a70ca18 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -100,7 +100,7 @@
                                     </fileset>
                                 </path>
                                 <pathconvert pathsep=" " property="proto.files" refid="proto.path" />
-                                <exec executable="protoc" failonerror="true">
+                                <exec executable="${protoc.path}protoc" failonerror="true">
                                     <arg value="--java_out=${project.build.directory}/generated-sources/proto" />
                                     <arg value="-I${project.basedir}/src/main/proto" />
                                     <arg line="${proto.files}" />

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/6344cb59/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8dab8c1..5038cd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,6 +182,7 @@
         <log4j.version>1.2.17</log4j.version>
         <netty.version>3.2.6.Final</netty.version>
         <protobuf.version>2.5.0</protobuf.version>
+        <protoc.path></protoc.path>
         <mockito.version>1.9.5</mockito.version>
         <disruptor.version>3.2.0</disruptor.version>
         <metrics.version>3.0.1</metrics.version>