Sync protobuf dependencies in the Bazel workspace and the Maven proje…

…ct definitions.

PiperOrigin-RevId: 284693335
(cherry picked from commit d898bdd)

WORKSPACE

@@ -106,24 +106,6 @@ switched_rules_by_language(
     grpc = True,
 )
 
-# gRPC.
-# Release from 2019-08-15
-http_archive(
-    name = "com_github_grpc_grpc",
-    urls = [
-        "https://github.com/grpc/grpc/archive/v1.22.1.tar.gz",
-    ],
-    sha256 = "cce1d4585dd017980d4a407d8c5e9f8fc8c1dbb03f249b99e88a387ebb45a035",
-    strip_prefix = "grpc-1.22.1",
-)
-
-# Load grpc_deps.
-# This is a workaround around the missing support for recursive WORKSPACE
-# file loading (https://github.com/bazelbuild/bazel/issues/1943).
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
-grpc_deps()
-
 # Release from 2016-05-30
 http_archive(
     name = "curl",
@@ -153,12 +135,12 @@ http_archive(
 # on @com_google_protobuf//:proto, @com_google_protobuf//:cc_toolchain and
 # @com_google_protobuf//:java_toolchain, respectively.
 # This statement defines the @com_google_protobuf repo.
-# Release from 2019-08-05
+# Release from 2019-12-02
 http_archive(
     name = "com_google_protobuf",
-    strip_prefix = "protobuf-3.9.1",
-    urls = ["https://github.com/google/protobuf/archive/v3.9.1.zip"],
-    sha256 = "c90d9e13564c0af85fd2912545ee47b57deded6e5a97de80395b6d2d9be64854",
+    strip_prefix = "protobuf-3.11.1",
+    urls = ["https://github.com/google/protobuf/archive/v3.11.1.zip"],
+    sha256 = "20e55e7dc9ebbb5800072fff25fd56d7c0a168493ef4652e78910566fa6b45f5",
 )
 
 # Load protobuf_deps.
@@ -171,14 +153,18 @@ protobuf_deps()
 # java_lite_proto_library rules implicitly depend on
 # @com_google_protobuf_javalite//:javalite_toolchain, which is the JavaLite proto
 # runtime (base classes and common utilities).
-# Commit from 2019-08-23 on the javalite branch.
+# Commit from 2019-12-03 on the 3.11.x branch.
 http_archive(
     name = "com_google_protobuf_javalite",
-    strip_prefix = "protobuf-7b64714af67aa967dcf941df61fe5207975966be",
-    urls = ["https://github.com/google/protobuf/archive/7b64714af67aa967dcf941df61fe5207975966be.zip"],
-    sha256 = "311b29b8d0803ab4f89be22ff365266abb6c48fd3483d59b04772a144d7a24a1",
+    strip_prefix = "protobuf-0425fa932ce95a32bb9f88b2c09b995e9ff8207b",
+    urls = ["https://github.com/google/protobuf/archive/0425fa932ce95a32bb9f88b2c09b995e9ff8207b.zip"],
+    sha256 = "e60211a40473f6be95b53f64559f82a3b2971672b11710db2fc9081708e25699",
 )
 
+load("@com_google_protobuf_javalite//:protobuf_deps.bzl", javalite_protobuf_deps = "protobuf_deps")
+
+javalite_protobuf_deps()
+
 #-----------------------------------------------------------------------------
 # java
 #-----------------------------------------------------------------------------
@@ -637,6 +623,32 @@ new_local_repository(
     path = "/usr/local",
 )
 
+#-----------------------------------------------------------------------------
+# gRPC
+#-----------------------------------------------------------------------------
+
+# Release from 2019-12-05
+# Using the pre-release version due to https://github.com/grpc/grpc/issues/20511
+http_archive(
+    name = "com_github_grpc_grpc",
+    urls = [
+        "https://github.com/grpc/grpc/archive/v1.26.0-pre1.tar.gz",
+    ],
+    sha256 = "d6af0859d3ae4693b1955e972aa2e590d6f4d44baaa82651467c6beea453e30e",
+    strip_prefix = "grpc-1.26.0-pre1",
+)
+
+# Load grpc_deps.
+# This is a workaround around the missing support for recursive WORKSPACE
+# file loading (https://github.com/bazelbuild/bazel/issues/1943).
+load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
+
+grpc_deps()
+
+load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
+
+grpc_extra_deps()
+
 #-----------------------------------------------------------------------------
 # Remote Build Execution
 #-----------------------------------------------------------------------------

java/BUILD.bazel

@@ -245,7 +245,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink/testing:streaming_test_util",
         "//java/src/main/java/com/google/crypto/tink/testing:test_util",
         "//java/src/main/java/com/google/crypto/tink/testing:wycheproof_test_util",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
         "@maven//:com_amazonaws_aws_java_sdk_core",
         "@maven//:com_amazonaws_aws_java_sdk_kms",
         "@maven//:com_google_api_client_google_api_client",

java/src/main/java/com/google/crypto/tink/BUILD.bazel

@@ -111,7 +111,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink/subtle",
         ":primitives",
         "@com_google_code_findbugs_jsr305",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
         "@org_json",
     ],
 )
@@ -134,7 +134,7 @@ java_library(
     javacopts = JAVACOPTS_OSS,
     deps = full_protos + [
         ":tink",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 
@@ -146,7 +146,7 @@ java_library(
     javacopts = JAVACOPTS_OSS,
     deps = lite_protos + [
         ":android",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 
@@ -157,7 +157,7 @@ java_library(
     deps = [
         ":core",
         "//proto:tink_java_proto",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 
@@ -168,6 +168,6 @@ java_library(
     deps = [
         ":core-android",
         "//proto:tink_java_proto_lite",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )

java/src/main/java/com/google/crypto/tink/aead/BUILD.bazel

@@ -56,7 +56,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink/mac",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:aead",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 
@@ -71,6 +71,6 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink/mac:android",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:aead",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )

java/src/main/java/com/google/crypto/tink/daead/BUILD.bazel

@@ -36,7 +36,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:daead",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 
@@ -49,6 +49,6 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink:android",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:daead",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )

java/src/main/java/com/google/crypto/tink/hybrid/BUILD.bazel

@@ -50,7 +50,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink/mac",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:hybrid",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 
@@ -67,6 +67,6 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink/mac:android",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:hybrid",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )

java/src/main/java/com/google/crypto/tink/integration/android/BUILD.bazel

@@ -38,6 +38,6 @@ android_library(
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:aead",
         "@com_google_code_findbugs_jsr305",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )

java/src/main/java/com/google/crypto/tink/mac/BUILD.bazel

@@ -38,7 +38,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:mac",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 
@@ -51,6 +51,6 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink:android",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:mac",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )

java/src/main/java/com/google/crypto/tink/prf/BUILD.bazel

@@ -16,7 +16,7 @@ java_library(
         "//proto:common_java_proto",
         "//proto:hkdf_prf_java_proto",
         "//proto:tink_java_proto",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 
@@ -43,7 +43,7 @@ java_library(
         "//proto:common_java_proto_lite",
         "//proto:hkdf_prf_java_proto_lite",
         "//proto:tink_java_proto_lite",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 

java/src/main/java/com/google/crypto/tink/signature/BUILD.bazel

@@ -45,7 +45,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink/annotations",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:signature",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )
 
@@ -59,6 +59,6 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink/annotations",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:signature",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
     ],
 )

java/src/main/java/com/google/crypto/tink/streamingaead/BUILD.bazel

@@ -40,7 +40,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:streaming",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
         "@com_google_code_findbugs_jsr305",
     ],
 )
@@ -54,7 +54,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink:android",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//java/src/main/java/com/google/crypto/tink/subtle:streaming",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
         "@com_google_code_findbugs_jsr305",
     ],
 )

java/src/main/java/com/google/crypto/tink/testing/BUILD.bazel

@@ -36,7 +36,7 @@ java_library(
         "//proto:rsa_ssa_pkcs1_java_proto",
         "//proto:rsa_ssa_pss_java_proto",
         "//proto:tink_java_proto",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
         "@maven//:com_google_truth_truth",
         "@maven//:junit_junit",
     ],
@@ -71,7 +71,7 @@ java_library(
         "//proto:rsa_ssa_pkcs1_java_proto_lite",
         "//proto:rsa_ssa_pss_java_proto_lite",
         "//proto:tink_java_proto_lite",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
         "@maven//:com_google_truth_truth",
         "@maven//:junit_junit",
     ],

maven/tink-android.pom.xml

@@ -65,7 +65,7 @@
     <java.version>1.7</java.version>
 
     <!-- library versions -->
-    <protobuf-javalite.version>3.10.0</protobuf-javalite.version>
+    <protobuf-javalite.version>3.11.1</protobuf-javalite.version>
   </properties>
 
   <dependencies>

maven/tink.pom.xml

@@ -65,7 +65,7 @@
     <java.version>1.7</java.version>
 
     <json.version>20180813</json.version>
-    <protobuf.version>3.10.0</protobuf.version>
+    <protobuf.version>3.11.1</protobuf.version>
   </properties>
 
   <dependencies>

tools/tinkey/BUILD.bazel

@@ -29,7 +29,7 @@ java_library(
         "//java/src/main/java/com/google/crypto/tink/streamingaead",
         "//java/src/main/java/com/google/crypto/tink/subtle",
         "//proto:tink_java_proto",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
         "@maven//:args4j_args4j",
     ],
 )
@@ -63,7 +63,7 @@ java_library(
         ":libtinkey",
         "//java:testonly",
         "//java:testutil",
-        "@com_google_protobuf_javalite//:protobuf_java_lite",
+        "@com_google_protobuf_javalite//:protobuf_javalite",
         "@maven//:com_google_truth_truth",
         "@maven//:junit_junit",
     ],