diff --git a/bazel/protobuf.patch b/bazel/protobuf.patch index a6318ce8e49ff..a8c5e959ddbe8 100644 --- a/bazel/protobuf.patch +++ b/bazel/protobuf.patch @@ -1,32 +1,24 @@ -# https://github.com/protocolbuffers/protobuf/pull/6720 -diff --git a/third_party/BUILD b/third_party/BUILD -new file mode 100644 -index 0000000000..b66101a39a ---- /dev/null -+++ b/third_party/BUILD -@@ -0,0 +1,1 @@ -+exports_files(["six.BUILD", "zlib.BUILD"]) diff --git a/BUILD b/BUILD -index 7de87f884..3f0fd5362 100644 +index 1690d4219..8a7f1bf14 100644 --- a/BUILD +++ b/BUILD @@ -19,7 +19,7 @@ exports_files(["LICENSE"]) # ZLIB configuration ################################################################################ - + -ZLIB_DEPS = ["@zlib//:zlib"] +ZLIB_DEPS = ["//external:zlib"] - + ################################################################################ # Protobuf Runtime Library diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py -index cb4740412..91fe69ce5 100644 +index 68087e550..0a2d63e73 100644 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -31,3 +31,9 @@ # Copyright 2007 Google Inc. All Rights Reserved. - - __version__ = '3.18.0' + + __version__ = '3.19.0' + +if __name__ != '__main__': + try: diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index ae5295c721c00..8980e2e2570c3 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -626,12 +626,12 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "Protocol Buffers", project_desc = "Language-neutral, platform-neutral extensible mechanism for serializing structured data", project_url = "https://developers.google.com/protocol-buffers", - version = "3.18.0", - sha256 = "52b6160ae9266630adb5e96a9fc645215336371a740e87d411bfb63ea2f268a0", + version = "3.19.0", + sha256 = "7b8d3ac3d6591ce9d25f90faba80da78d0ef620fda711702367f61a40ba98429", strip_prefix = "protobuf-{version}", urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v{version}/protobuf-all-{version}.tar.gz"], use_category = ["dataplane_core", "controlplane"], - release_date = "2021-09-15", + release_date = "2021-10-20", cpe = "cpe:2.3:a:google:protobuf:*", ), grpc_httpjson_transcoding = dict(