Fix protobuf in the WORKSPACE

Fixes https://buildkite.com/bazel/bazel-bazel/builds/4327#882adb9d-7a31-4df8-b94c-c11794ef4468 RELNOTES: None. PiperOrigin-RevId: 211619161
bazelbuild · Sep 5, 2018 · ead1002 · ead1002
1 parent bcaad80
commit ead1002
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -69,20 +69,20 @@ bind(
 
 new_local_repository(
     name = "com_google_protobuf",
-    build_file = "./third_party/protobuf/3.6.0/BUILD",
-    path = "./third_party/protobuf/3.6.0/",
+    build_file = "./third_party/protobuf/3.6.1/BUILD",
+    path = "./third_party/protobuf/3.6.1/",
 )
 
 new_local_repository(
     name = "com_google_protobuf_cc",
-    build_file = "./third_party/protobuf/3.6.0/BUILD",
-    path = "./third_party/protobuf/3.6.0/",
+    build_file = "./third_party/protobuf/3.6.1/BUILD",
+    path = "./third_party/protobuf/3.6.1/",
 )
 
 new_local_repository(
     name = "com_google_protobuf_java",
-    build_file = "./third_party/protobuf/3.6.0/com_google_protobuf_java.BUILD",
-    path = "./third_party/protobuf/3.6.0/",
+    build_file = "./third_party/protobuf/3.6.1/com_google_protobuf_java.BUILD",
+    path = "./third_party/protobuf/3.6.1/",
 )
 
 new_local_repository(

diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("//tools/build_rules:genproto.bzl", "cc_grpc_library")
 load("//tools/build_rules:utilities.bzl", "java_library_srcs")
-load("//third_party/protobuf/3.6.0:protobuf.bzl", "py_proto_library")
+load("//third_party/protobuf/3.6.1:protobuf.bzl", "py_proto_library")
 load("//third_party/grpc:build_defs.bzl", "java_grpc_library")
 
 exports_files(

diff --git a/src/test/shell/bazel/testdata/embedded_tools_srcs_deps b/src/test/shell/bazel/testdata/embedded_tools_srcs_deps
@@ -2,7 +2,6 @@
 @com_google_protobuf//:protoc_lib
 @com_google_protobuf//:protobuf
 @com_google_protobuf//:protobuf_lite
-@com_google_protobuf//:js_embed
 //tools/test:test_wrapper_bin
 //third_party/ijar:zipper
 //third_party/ijar:ijar

diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
@@ -115,7 +115,7 @@ if [ "${MACHINE_TYPE}" = 's390x' ]; then
 fi
 
 # Requires //third_party/protobuf:protoc
-protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/3.6.0/protoc"
+protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/3.6.1/protoc"
 
 if [ -z ${RUNFILES_MANIFEST_ONLY+x} ]; then
   junit_jar="${BAZEL_RUNFILES}/third_party/junit/junit-*.jar"