Upgrade protobuf (digital-asset#1781)

* Upgrade protobuf This fixes the annoying “illegal reflective access” warnings when using a newer JDK. * Add release notes
iggy-da · Jun 20, 2019 · 8272f95 · 8272f95
1 parent 15827d4
commit 8272f95
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/3rdparty/dependencies.digest b/3rdparty/dependencies.digest
@@ -1 +1 @@
-5261184634cb10d42d80a384e8eed64d8bb8eb05  dependencies.yaml
+bf2b64e5a9437d697584037ad2a924c8b4e98736  dependencies.yaml
diff --git a/3rdparty/workspace.bzl b/3rdparty/workspace.bzl
@@ -157,12 +157,12 @@ def list_dependencies():
     {"artifact": "com.google.guava:guava:24.0-jre", "lang": "java", "sha1": "041ac1e74d6b4e1ea1f027139cffeb536c732a81", "sha256": "e0274470b16ba1154e926b5f54ef8ae159197fbc356406bda9b261ba67e3e599", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/guava/guava/24.0-jre/guava-24.0-jre.jar", "source": {"sha1": "04530f6a317a2d55e8903874896537dcf39717b7", "sha256": "21fbd6a606c140cfd09400b9b0a5524da1e1cdda11544ce733a4795bb9340e85", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/guava/guava/24.0-jre/guava-24.0-jre-sources.jar"} , "name": "com_google_guava_guava", "actual": "@com_google_guava_guava//jar", "bind": "jar/com/google/guava/guava"},
     {"artifact": "com.google.j2objc:j2objc-annotations:1.1", "lang": "java", "sha1": "ed28ded51a8b1c6b112568def5f4b455e6809019", "sha256": "2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar", "source": {"sha1": "1efdf5b737b02f9b72ebdec4f72c37ec411302ff", "sha256": "2cd9022a77151d0b574887635cdfcdf3b78155b602abc89d7f8e62aba55cfb4f", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1-sources.jar"} , "name": "com_google_j2objc_j2objc_annotations", "actual": "@com_google_j2objc_j2objc_annotations//jar", "bind": "jar/com/google/j2objc/j2objc_annotations"},
     {"artifact": "com.google.protobuf:protobuf-java-util:3.5.1", "lang": "java", "sha1": "6e40a6a3f52455bd633aa2a0dba1a416e62b4575", "sha256": "8bd8a5de6d7e05dce16c8198c8013ebd9c703e10db957fb6dfab0ad24bcd8adc", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.5.1/protobuf-java-util-3.5.1.jar", "source": {"sha1": "cb2afe26d66d7d844465baf9ce0105990a26e639", "sha256": "ea3a1b469f067c11b0c831336ec7490cf44e9a323b04562ae7894d9388b8607b", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.5.1/protobuf-java-util-3.5.1-sources.jar"} , "name": "com_google_protobuf_protobuf_java_util", "actual": "@com_google_protobuf_protobuf_java_util//jar", "bind": "jar/com/google/protobuf/protobuf_java_util"},
-# duplicates in com.google.protobuf:protobuf-java fixed to 3.6.1
+# duplicates in com.google.protobuf:protobuf-java fixed to 3.8.0
 # - com.google.protobuf:protobuf-java-util:3.5.1 wanted version 3.5.1
 # - com.thesamet.scalapb:compilerplugin_2.12:0.8.4 wanted version 3.6.1
 # - com.thesamet.scalapb:scalapb-runtime_2.12:0.8.4 wanted version 3.6.1
 # - io.grpc:grpc-protobuf:1.18.0 wanted version 3.5.1
-    {"artifact": "com.google.protobuf:protobuf-java:3.6.1", "lang": "java", "sha1": "0d06d46ecfd92ec6d0f3b423b4cd81cb38d8b924", "sha256": "fb66d913ff0578553b2e28a3338cbbbe2657e6cfe0e98d939f23aea219daf508", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1.jar", "source": {"sha1": "b0782bcd21ad5c52031e74efbc4c3d6a6df96130", "sha256": "9e8996b159b1b676adfe58bce785a73ded6e4a21c25a69251ef25e585ebfaeee", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1-sources.jar"} , "name": "com_google_protobuf_protobuf_java", "actual": "@com_google_protobuf_protobuf_java//jar", "bind": "jar/com/google/protobuf/protobuf_java"},
+    {"artifact": "com.google.protobuf:protobuf-java:3.8.0", "lang": "java", "sha1": "b5f93103d113540bb848fe9ce4e6819b1f39ee49", "sha256": "94ba90a869ddad07eb49afaa8f39e676c2554b5b1c417ad9e1188257e79be60f", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/protobuf/protobuf-java/3.8.0/protobuf-java-3.8.0.jar", "source": {"sha1": "df71e14a1af8ba1ff508528f9057b535ac8b66b2", "sha256": "1982b2a96f752cf0d64c3066b5e9e4016f9cc825591f3d1a9c40a017203fcb2f", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/protobuf/protobuf-java/3.8.0/protobuf-java-3.8.0-sources.jar"} , "name": "com_google_protobuf_protobuf_java", "actual": "@com_google_protobuf_protobuf_java//jar", "bind": "jar/com/google/protobuf/protobuf_java"},
     {"artifact": "com.google.re2j:re2j:1.2", "lang": "java", "sha1": "4361eed4abe6f84d982cbb26749825f285996dd2", "sha256": "e9dc705fd4c570344b54a7146b2e3a819cdc271a29793f4acc1a93b56a388e59", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/re2j/re2j/1.2/re2j-1.2.jar", "source": {"sha1": "ab327b17d845dc7b419d5eb5f04566b9cd4b9c94", "sha256": "43a81e5a7bf2b3119b592910098cca0835f012d2805bcfdade44cdc8f2bdfb48", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/google/re2j/re2j/1.2/re2j-1.2-sources.jar"} , "name": "com_google_re2j_re2j", "actual": "@com_google_re2j_re2j//jar", "bind": "jar/com/google/re2j/re2j"},
     {"artifact": "com.h2database:h2:1.4.198", "lang": "java", "sha1": "c5693092efef44cc4587828afe12f7f7208a67f4", "sha256": "32dd6b149cb722aa4c2dd4d40a74a9cd41e32ac59a4e755a66e5753660d61d46", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/h2database/h2/1.4.198/h2-1.4.198.jar", "source": {"sha1": "0f0f3e411cc9633b7e34b3cd6cd217a96c31e89b", "sha256": "0bbe35cd781cddbcdfc01f5010f5a273accf5d5f3db0b5958945c8b32cfc08f6", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/h2database/h2/1.4.198/h2-1.4.198-sources.jar"} , "name": "com_h2database_h2", "actual": "@com_h2database_h2//jar", "bind": "jar/com/h2database/h2"},
     {"artifact": "com.jcraft:jsch:0.1.54", "lang": "java", "sha1": "da3584329a263616e277e15462b387addd1b208d", "sha256": "92eb273a3316762478fdd4fe03a0ce1842c56f496c9c12fe1235db80450e1fdb", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/jcraft/jsch/0.1.54/jsch-0.1.54.jar", "source": {"sha1": "91d6069df9be9e076bdb124e82fc2a9af9547616", "sha256": "49d021dd58f6b455046a07331a68a5e647df354d7f6961b73df298203c43f44a", "repository": "http://central.maven.org/maven2/", "url": "http://central.maven.org/maven2/com/jcraft/jsch/0.1.54/jsch-0.1.54-sources.jar"} , "name": "com_jcraft_jsch", "actual": "@com_jcraft_jsch//jar", "bind": "jar/com/jcraft/jsch"},

diff --git a/WORKSPACE b/WORKSPACE
@@ -12,6 +12,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 daml_deps()
 
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
 load("@io_tweag_rules_haskell//haskell:repositories.bzl", "haskell_repositories")
 
 haskell_repositories()

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -22,7 +22,7 @@ dependencies:
   com.google.protobuf:
     protobuf-java:
       lang: java
-      version: "3.6.1"
+      version: "3.8.0"
 
   io.grpc:
     grpc-core:

diff --git a/deps.bzl b/deps.bzl
@@ -103,17 +103,9 @@ def daml_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            sha256 = "9510dd2afc29e7245e9e884336f848c8a6600a14ae726adb6befdb4f786f0be2",
-            strip_prefix = "protobuf-3.6.1.3",
-            urls = ["https://github.com/google/protobuf/archive/v3.6.1.3.zip"],
-        )
-
-    if "com_google_protobuf_javalite" not in native.existing_rules():
-        http_archive(
-            name = "com_google_protobuf_javalite",
-            sha256 = "79d102c61e2a479a0b7e5fc167bcfaa4832a0c6aad4a75fa7da0480564931bcc",
-            strip_prefix = "protobuf-384989534b2246d413dbcd750744faab2607b516",
-            urls = ["https://github.com/google/protobuf/archive/384989534b2246d413dbcd750744faab2607b516.zip"],
+            sha256 = "1e622ce4b84b88b6d2cdf1db38d1a634fe2392d74f0b7b74ff98f3a51838ee53",
+            strip_prefix = "protobuf-3.8.0",
+            urls = ["https://github.com/google/protobuf/archive/v3.8.0.zip"],
         )
 
     if "io_bazel_skydoc" not in native.existing_rules():

diff --git a/unreleased.rst b/unreleased.rst
@@ -19,3 +19,5 @@ HEAD — ongoing
   preserved when the scenario results are updated.
   See `#1675 <https://github.com/digital-asset/daml/issues/1675>`__.
 - [DAML-LF] Rename ``TO_TEXT_CODE_POINTS`` and ``FROM_TEXT_CODE_POINTS`` to ``TEXT_FROM_CODE_POINTS`` and ``TEXT_TO_CODE_POINTS``, resp.
+- [Dependencies] Protobuf has been upgraded to version 3.8.0. This
+  also includes the protobuf-java library used as a dependency.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		5261184634cb10d42d80a384e8eed64d8bb8eb05 dependencies.yaml
		bf2b64e5a9437d697584037ad2a924c8b4e98736 dependencies.yaml