[kudu] branch master updated: [build] Add the option to use the protoc from thirdparty in the java build

[gr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new 0ddb503  [build] Add the option to use the protoc from thirdparty in the java build
0ddb503 is described below

commit 0ddb503ae4cb4e48329a23983bab8f553aaca887
Author: Grant Henke <gr...@apache.org>
AuthorDate: Thu Dec 10 09:37:46 2020 -0600

    [build] Add the option to use the protoc from thirdparty in the java build
    
    This patch introduces the option to use the thirdparty protoc in the
    java build via `-PuseKuduProtoc`.  This is useful if a specific OS or
    architecture is not published to Maven.
    
    ex: `gradle assemble -PuseKuduProtoc`
    
    Change-Id: I64bdf94c222c971b4900213d58f25c50c860ec9f
    Reviewed-on: http://gerrit.cloudera.org:8080/16854
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
    Reviewed-by: Andrew Wong <aw...@cloudera.com>
    Tested-by: Kudu Jenkins
---
 java/gradle/dependencies.gradle |  2 +-
 java/gradle/protobuf.gradle     | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 62f838e..9c046b9 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -67,7 +67,7 @@ versions += [
 
 // Log the Gradle version used vs defined.
 if (gradle.gradleVersion != versions.gradle) {
-  println "Using gradle version $gradle.gradleVersion (Build defines $versions.gradle)"
+  logger.warn("Using gradle version $gradle.gradleVersion (Build defines $versions.gradle)")
 }
 
 // If the `spark2` property is passed, override the `spark` and `scala` version
diff --git a/java/gradle/protobuf.gradle b/java/gradle/protobuf.gradle
index 5bcabd3..384f38c 100644
--- a/java/gradle/protobuf.gradle
+++ b/java/gradle/protobuf.gradle
@@ -22,7 +22,15 @@ apply plugin: "com.google.protobuf"
 // Use the maven protoc artifact instead of local.
 protobuf {
   protoc {
-    artifact = libs.protoc
+    // If -PuseKuduProtoc is set, use the protoc from Kudu's thirdparty instead
+    // of using the protoc Maven artifacts. This is useful if a specific
+    // OS or architecture is not published to Maven.
+    if (propertyExists("useKuduProtoc")) {
+      logger.warn("Using Protoc from: $rootDir/../thirdparty/installed/uninstrumented/bin/protoc")
+      path = "$rootDir/../thirdparty/installed/uninstrumented/bin/protoc"
+    } else {
+      artifact = libs.protoc
+    }
   }
 }