[kudu] branch master updated: KUDU-2755: [Java] Upgrade protoc to 3.7.1

[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 577caf8  KUDU-2755: [Java] Upgrade protoc to 3.7.1
577caf8 is described below

commit 577caf8691fc90de688a851e663bd41873c5f45f
Author: Grant Henke <gr...@apache.org>
AuthorDate: Mon Apr 1 11:57:29 2019 -0500

    KUDU-2755: [Java] Upgrade protoc to 3.7.1
    
    This fixes build failures due to a bug where protoc
    3.7.0 was linking libatomic.
    
    Change-Id: I7ec26fcd386534ff74150c0a6f0547798067e4ea
    Reviewed-on: http://gerrit.cloudera.org:8080/12904
    Tested-by: Kudu Jenkins
    Reviewed-by: Andrew Wong <aw...@cloudera.com>
---
 java/gradle/dependencies.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/gradle/dependencies.gradle b/java/gradle/dependencies.gradle
index 433e010..181a146 100755
--- a/java/gradle/dependencies.gradle
+++ b/java/gradle/dependencies.gradle
@@ -50,6 +50,10 @@ versions += [
     parquet        : "1.10.1",
     pmd            : "5.8.1",
     protobuf       : "3.7.0",
+    // protoc 3.7.0 has a bug where it links against libatomic but there
+    // is not protobuf-java 3.7.1, so we use a seperate version until we
+    // upgrade again.
+    protoc         : "3.7.1",
     scala          : "2.11.12",
     scalatest      : "3.0.7",
     scopt          : "3.7.1",
@@ -101,7 +105,7 @@ libs += [
     parquetHadoop        : "org.apache.parquet:parquet-hadoop:$versions.parquet",
     protobufJava         : "com.google.protobuf:protobuf-java:$versions.protobuf",
     protobufJavaUtil     : "com.google.protobuf:protobuf-java-util:$versions.protobuf",
-    protoc               : "com.google.protobuf:protoc:$versions.protobuf",
+    protoc               : "com.google.protobuf:protoc:$versions.protoc",
     scalaLibrary         : "org.scala-lang:scala-library:$versions.scala",
     scalap               : "org.scala-lang:scalap:$versions.scala",
     scalatest            : "org.scalatest:scalatest_$versions.scalaBase:$versions.scalatest",