bazel: Remove com_google_protobuf_java

This was deprecated with Bazel 0.8.0, which now uses
@com_google_protobuf instead.

This change will break users that use
grpc_java_repositories(omit_com_google_protobuf_java=True), so I've
added a custom error message to make the resolution clearer.

6 files changed, 11 insertions, 21 deletions

diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
index 4a865638d..eca28b134 100644
--- a/examples/BUILD.bazel
+++ b/examples/BUILD.bazel
@@ -60,17 +60,17 @@ java_library(
         ["src/main/resources/**"],
     ),
     deps = [
-        ":helloworld_java_grpc",
-        ":helloworld_java_proto",
         ":hello_streaming_java_grpc",
         ":hello_streaming_java_proto",
+        ":helloworld_java_grpc",
+        ":helloworld_java_proto",
         ":route_guide_java_grpc",
         ":route_guide_java_proto",
         "@com_google_api_grpc_proto_google_common_protos//jar",
         "@com_google_code_findbugs_jsr305//jar",
         "@com_google_guava_guava//jar",
-        "@com_google_protobuf_java//:protobuf_java",
-        "@com_google_protobuf_java//:protobuf_java_util",
+        "@com_google_protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java_util",
         "@grpc_java//core",
         "@grpc_java//protobuf",
         "@grpc_java//stub",
diff --git a/examples/README.md b/examples/README.md
index 55c76f49b..051382ee1 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -53,7 +53,7 @@ $ mvn exec:java -Dexec.mainClass=io.grpc.examples.helloworld.HelloWorldClient
 
 If you prefer to use Bazel:
 ```
-(With Bazel v0.4.5 or above.)
+(With Bazel v0.8.0 or above.)
 $ bazel build :hello-world-server :hello-world-client
 $ # Run the server:
 $ bazel-bin/hello-world-server
diff --git a/java_grpc_library.bzl b/java_grpc_library.bzl
index 4caf1e416..0fef76003 100644
--- a/java_grpc_library.bzl
+++ b/java_grpc_library.bzl
@@ -113,7 +113,7 @@ def java_grpc_library(name, srcs, deps, flavor=None,
       "@com_google_guava_guava//jar",
   ]
   if flavor == "normal":
-    added_deps += ["@com_google_protobuf_java//:protobuf_java"]
+    added_deps += ["@com_google_protobuf//:protobuf_java"]
   elif flavor == "lite":
     # TODO: This is currently blocked on https://github.com/google/protobuf/issues/2762
     added_deps += ["@com_google_protobuf_java_lite//:protobuf_java_lite"]
diff --git a/protobuf-lite/BUILD.bazel b/protobuf-lite/BUILD.bazel
index 6dde2935d..99e3a56cb 100644
--- a/protobuf-lite/BUILD.bazel
+++ b/protobuf-lite/BUILD.bazel
@@ -9,6 +9,6 @@ java_library(
         "//core",
         "@com_google_code_findbugs_jsr305//jar",
         "@com_google_guava_guava//jar",
-        "@com_google_protobuf_java//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java",
     ],
 )
diff --git a/protobuf/BUILD.bazel b/protobuf/BUILD.bazel
index 69949ea44..ea611308d 100644
--- a/protobuf/BUILD.bazel
+++ b/protobuf/BUILD.bazel
@@ -10,7 +10,7 @@ java_library(
         "@com_google_api_grpc_proto_google_common_protos//jar",
         "@com_google_code_findbugs_jsr305//jar",
         "@com_google_guava_guava//jar",
-        "@com_google_protobuf_java//:protobuf_java",
-        "@com_google_protobuf_java//:protobuf_java_util",
+        "@com_google_protobuf//:protobuf_java",
+        "@com_google_protobuf//:protobuf_java_util",
     ],
 )
diff --git a/repositories.bzl b/repositories.bzl
index c168e9a33..a2eca47c7 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -45,8 +45,8 @@ def grpc_java_repositories(
     com_google_instrumentation_api()
   if not omit_com_google_protobuf:
     com_google_protobuf()
-  if not omit_com_google_protobuf_java:
-    com_google_protobuf_java()
+  if omit_com_google_protobuf_java:
+    fail("omit_com_google_protobuf_java is no longer supported and must be not be passed to grpc_java_repositories()")
   if not omit_com_google_protobuf_nano_protobuf_javanano:
     com_google_protobuf_nano_protobuf_javanano()
   if not omit_com_google_truth_truth:
@@ -153,16 +153,6 @@ def com_google_protobuf():
       urls = ["https://github.com/google/protobuf/archive/v3.5.1.zip"],
   )
 
-def com_google_protobuf_java():
-  # java_proto_library rules implicitly depend on @com_google_protobuf_java//:java_toolchain,
-  # which is the Java proto runtime (base classes and common utilities).
-  native.http_archive(
-      name = "com_google_protobuf_java",
-      sha256 = "1f8b9b202e9a4e467ff0b0f25facb1642727cdf5e69092038f15b37c75b99e45",
-      strip_prefix = "protobuf-3.5.1",
-      urls = ["https://github.com/google/protobuf/archive/v3.5.1.zip"],
-  )
-
 def com_google_protobuf_nano_protobuf_javanano():
   native.maven_jar(
       name = "com_google_protobuf_nano_protobuf_javanano",