From abe77ae13efb7112385fbe683bf6c44900ddd8a6 Mon Sep 17 00:00:00 2001 From: johnnyshields Date: Sat, 14 May 2022 11:41:32 +0900 Subject: [PATCH 01/14] Backport: Ruby: support x64-mingw-ucrt platform, which is the new platform which Windows Ruby Installer uses as of Ruby 3.1 --- ruby/Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby/Rakefile b/ruby/Rakefile index 8b5b68d855..d8ac763e09 100644 --- a/ruby/Rakefile +++ b/ruby/Rakefile @@ -103,7 +103,7 @@ else ext.lib_dir = "lib/google" ext.cross_compile = true ext.cross_platform = [ - 'x86-mingw32', 'x64-mingw32', + 'x86-mingw32', 'x64-mingw32', 'x64-mingw-ucrt', 'x86_64-linux', 'x86-linux', 'x86_64-darwin', 'arm64-darwin', ] @@ -126,7 +126,7 @@ else task 'gem:windows' do sh "rm Gemfile.lock" require 'rake_compiler_dock' - ['x86-mingw32', 'x64-mingw32', 'x86_64-linux', 'x86-linux'].each do |plat| + ['x86-mingw32', 'x64-mingw32', 'x64-mingw-ucrt', 'x86_64-linux', 'x86-linux'].each do |plat| RakeCompilerDock.sh <<-"EOT", platform: plat bundle && \ IN_DOCKER=true rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0:2.5.0 From d3edfa29b743ef7303e0ddd7b4bc03bf2ff6a7fe Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Mon, 16 May 2022 16:44:24 +0000 Subject: [PATCH 02/14] Use osx-aarch_64 artifact --- protoc-artifacts/pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 7f285cae46..45c2123f13 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -71,11 +71,7 @@ exe - - ${basedir}/target/osx/x86_64/protoc.exe + ${basedir}/target/osx/aarch_64/protoc.exe osx-aarch_64 exe From 8353e1975683e4cbf451f6283ee1b2b43e5002b4 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Mon, 16 May 2022 17:10:27 +0000 Subject: [PATCH 03/14] Updated to the newest upb, which brings many fixes for Windows builds. --- protobuf_deps.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index 0f3c76aacc..966d506fd9 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl @@ -114,6 +114,6 @@ def protobuf_deps(): _github_archive( name = "upb", repo = "https://github.com/protocolbuffers/upb", - commit = "c3cfd09b0184bcbdade71a3d788df02c83e897f2", - sha256 = "4a9f79385fc0c1e3e7ba5c34220db53f956c8c42d636bafc6a563da2facf8c3f", + commit = "a60e9a379e976c1b8828145b8475618601cb9cee", + sha256 = "f5e021b986c62848c59f07fd68988e1bc50e782694710906374e4bd905db5c9f", ) From 0f3ee3b625b9b87e562f4544deb3290383fbe188 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Mon, 16 May 2022 22:48:41 +0000 Subject: [PATCH 04/14] Fix protoc_release target --- BUILD.bazel | 2 ++ pkg/BUILD.bazel | 33 ++++++++++++--------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 044e01e4f5..4763717334 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -186,6 +186,8 @@ exports_files( srcs = [ "src/google/protobuf/any.proto", "src/google/protobuf/api.proto", + "src/google/protobuf/compiler/plugin.proto", + "src/google/protobuf/descriptor.proto", "src/google/protobuf/duration.proto", "src/google/protobuf/empty.proto", "src/google/protobuf/field_mask.proto", diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel index 0de27d3a27..ecce255a28 100644 --- a/pkg/BUILD.bazel +++ b/pkg/BUILD.bazel @@ -17,25 +17,17 @@ package_naming( pkg_files( name = "wkt_protos_files", srcs = [ - "//:any_proto", - "//:api_proto", - "//:duration_proto", - "//:empty_proto", - "//:field_mask_proto", - "//:source_context_proto", - "//:struct_proto", - "//:timestamp_proto", - "//:type_proto", - "//:wrappers_proto", - ], - prefix = "include/google/protobuf", - visibility = ["//visibility:private"], -) - -pkg_files( - name = "descriptor_protos_files", - srcs = [ - "//:descriptor_proto", + "//:src/google/protobuf/any.proto", + "//:src/google/protobuf/api.proto", + "//:src/google/protobuf/descriptor.proto", + "//:src/google/protobuf/duration.proto", + "//:src/google/protobuf/empty.proto", + "//:src/google/protobuf/field_mask.proto", + "//:src/google/protobuf/source_context.proto", + "//:src/google/protobuf/struct.proto", + "//:src/google/protobuf/timestamp.proto", + "//:src/google/protobuf/type.proto", + "//:src/google/protobuf/wrappers.proto", ], prefix = "include/google/protobuf", visibility = ["//visibility:private"], @@ -43,7 +35,7 @@ pkg_files( pkg_files( name = "compiler_plugin_protos_files", - srcs = ["//:compiler_plugin_proto"], + srcs = ["//:src/google/protobuf/compiler/plugin.proto"], prefix = "include/google/protobuf/compiler", visibility = ["//visibility:private"], ) @@ -84,7 +76,6 @@ pkg_zip( name = "protoc_release", srcs = [ ":compiler_plugin_protos_files", - ":descriptor_protos_files", ":protoc_files", ":protoc_readme", ":wkt_protos_files", From 364852e829c5508294fa4c1cc8fc9f7ec9aebc60 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 17 May 2022 22:51:01 +0000 Subject: [PATCH 05/14] Throw a more helpful error if generated code is out of date, and fixed two reference leaks. --- protobuf_deps.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index 966d506fd9..362ae65772 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl @@ -114,6 +114,6 @@ def protobuf_deps(): _github_archive( name = "upb", repo = "https://github.com/protocolbuffers/upb", - commit = "a60e9a379e976c1b8828145b8475618601cb9cee", - sha256 = "f5e021b986c62848c59f07fd68988e1bc50e782694710906374e4bd905db5c9f", + commit = "12efc9b096f35b62055a217f45e6b0fe5fb1a099", + sha256 = "de0ab4ee1e2d8f01b494de39cd70b611e190b63943f1d5c448d4ecb9560dc16f", ) From a04d00312f150fc019edd32b9ce6ac8f2112e962 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Wed, 18 May 2022 21:39:30 +0000 Subject: [PATCH 06/14] Fixed PHP SEGV by not writing to shared memory for zend_class_entry. --- php/ext/google/protobuf/message.c | 5 ++--- php/ext/google/protobuf/protobuf.c | 16 +++++++++++++++- php/ext/google/protobuf/protobuf.h | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/php/ext/google/protobuf/message.c b/php/ext/google/protobuf/message.c index 27199640c9..55f4f4de35 100644 --- a/php/ext/google/protobuf/message.c +++ b/php/ext/google/protobuf/message.c @@ -603,10 +603,9 @@ PHP_METHOD(Message, __construct) { // will trigger an infinite construction loop and blow the stack. We // temporarily clear create_object to break this loop (see check in // NameMap_GetMessage()). - PBPHP_ASSERT(ce->create_object == Message_create); - ce->create_object = NULL; + NameMap_EnterConstructor(ce); desc = Descriptor_GetFromClassEntry(ce); - ce->create_object = Message_create; + NameMap_ExitConstructor(ce); if (!desc) { zend_throw_exception_ex( diff --git a/php/ext/google/protobuf/protobuf.c b/php/ext/google/protobuf/protobuf.c index 68c0ef00b1..c786b6eca0 100644 --- a/php/ext/google/protobuf/protobuf.c +++ b/php/ext/google/protobuf/protobuf.c @@ -56,6 +56,9 @@ ZEND_BEGIN_MODULE_GLOBALS(protobuf) // Set by the user to make the descriptor pool persist between requests. zend_bool keep_descriptor_pool_after_request; + // Set by the user to make the descriptor pool persist between requests. + zend_class_entry* constructing_class; + // A upb_DefPool that we are saving for the next request so that we don't have // to rebuild it from scratch. When keep_descriptor_pool_after_request==true, // we steal the upb_DefPool from the global DescriptorPool object just before @@ -173,6 +176,7 @@ static PHP_RINIT_FUNCTION(protobuf) { zend_hash_init(&PROTOBUF_G(object_cache), 64, NULL, NULL, 0); zend_hash_init(&PROTOBUF_G(descriptors), 64, NULL, ZVAL_PTR_DTOR, 0); + PROTOBUF_G(constructing_class) = NULL; return SUCCESS; } @@ -253,7 +257,7 @@ const upb_MessageDef *NameMap_GetMessage(zend_class_entry *ce) { const upb_MessageDef *ret = zend_hash_find_ptr(&PROTOBUF_G(name_msg_cache), ce->name); - if (!ret && ce->create_object) { + if (!ret && ce->create_object && ce != PROTOBUF_G(constructing_class)) { #if PHP_VERSION_ID < 80000 zval tmp; zval zv; @@ -279,6 +283,16 @@ const upb_EnumDef *NameMap_GetEnum(zend_class_entry *ce) { return ret; } +void NameMap_EnterConstructor(zend_class_entry* ce) { + assert(!PROTOBUF_G(constructing_class)); + PROTOBUF_G(constructing_class) = ce; +} + +void NameMap_ExitConstructor(zend_class_entry* ce) { + assert(PROTOBUF_G(constructing_class) == ce); + PROTOBUF_G(constructing_class) = NULL; +} + // ----------------------------------------------------------------------------- // Module init. // ----------------------------------------------------------------------------- diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 119e40d9df..292a0eeca0 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -155,6 +155,8 @@ void NameMap_AddMessage(const upb_MessageDef *m); void NameMap_AddEnum(const upb_EnumDef *m); const upb_MessageDef *NameMap_GetMessage(zend_class_entry *ce); const upb_EnumDef *NameMap_GetEnum(zend_class_entry *ce); +void NameMap_EnterConstructor(zend_class_entry* ce); +void NameMap_ExitConstructor(zend_class_entry* ce); // Add this descriptor object to the global list of descriptors that will be // kept alive for the duration of the request but destroyed when the request From 9806b0f57bef209b9d0afd996915b1468fb396e0 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Tue, 17 May 2022 08:54:35 +0800 Subject: [PATCH 07/14] Suppress CS8981 in generated source --- src/google/protobuf/compiler/csharp/csharp_reflection_class.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc b/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc index 644fbf16f9..d9ab4b49b0 100644 --- a/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc +++ b/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc @@ -128,7 +128,7 @@ void ReflectionClassGenerator::WriteIntroduction(io::Printer* printer) { "// Generated by the protocol buffer compiler. DO NOT EDIT!\n" "// source: $file_name$\n" "// \n" - "#pragma warning disable 1591, 0612, 3021\n" + "#pragma warning disable 1591, 0612, 3021, 8981\n" "#region Designer generated code\n" "\n" "using pb = global::Google.Protobuf;\n" From 70afbd3c8d8142c7fead0117450c5392bf1b7114 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 18 May 2022 15:50:11 +0200 Subject: [PATCH 08/14] regenerate C# protos --- csharp/src/AddressBook/Addressbook.cs | 2 +- .../src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs | 2 +- csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs | 2 +- .../src/Google.Protobuf.Benchmarks/WrapperBenchmarkMessages.cs | 2 +- csharp/src/Google.Protobuf.Conformance/Conformance.cs | 2 +- csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs | 2 +- .../src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs | 2 +- .../src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs | 2 +- csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs | 2 +- .../UnittestCustomOptionsProto3.cs | 2 +- csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs | 2 +- .../src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs | 2 +- .../src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs | 2 +- .../UnittestImportPublicProto3.cs | 2 +- .../src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.cs | 2 +- .../src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.cs | 2 +- .../src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.cs | 2 +- csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs | 2 +- csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs | 2 +- .../Google.Protobuf.Test.TestProtos/UnittestProto3Optional.cs | 2 +- .../UnittestSelfreferentialOptions.cs | 2 +- .../Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs | 2 +- csharp/src/Google.Protobuf/Reflection/Descriptor.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/Any.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/Api.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/Type.cs | 2 +- csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/csharp/src/AddressBook/Addressbook.cs b/csharp/src/AddressBook/Addressbook.cs index 484a2296a7..1ff0f3b6c6 100644 --- a/csharp/src/AddressBook/Addressbook.cs +++ b/csharp/src/AddressBook/Addressbook.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: addressbook.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs b/csharp/src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs index 412440417c..fe21d0c40b 100644 --- a/csharp/src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs +++ b/csharp/src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: datasets/google_message1/proto3/benchmark_message1_proto3.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs b/csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs index faa37b0508..a05802da56 100644 --- a/csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs +++ b/csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: benchmarks.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Benchmarks/WrapperBenchmarkMessages.cs b/csharp/src/Google.Protobuf.Benchmarks/WrapperBenchmarkMessages.cs index df427e8023..e2eb2e8b96 100644 --- a/csharp/src/Google.Protobuf.Benchmarks/WrapperBenchmarkMessages.cs +++ b/csharp/src/Google.Protobuf.Benchmarks/WrapperBenchmarkMessages.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: wrapper_benchmark_messages.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Conformance/Conformance.cs b/csharp/src/Google.Protobuf.Conformance/Conformance.cs index 0a3d5c604e..79977a0ca8 100644 --- a/csharp/src/Google.Protobuf.Conformance/Conformance.cs +++ b/csharp/src/Google.Protobuf.Conformance/Conformance.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: conformance.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs index 4791b73253..57e59a9ac3 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: map_unittest_proto3.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs b/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs index 94f089c3f2..35f2b8a15e 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/test_messages_proto2.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs index 5a2aa3bd5f..520216fdf5 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/test_messages_proto3.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs b/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs index 706b7c4736..c1f43ce0f8 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs index 305dfe188e..ea7a936af6 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_custom_options_proto3.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs index 4f40564ebd..de5f0c24db 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_import.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs index a3ce7a2259..d661c2d474 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_import_proto3.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs index b1e0f30adb..f8a0e55fb6 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_import_public.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs index dde8b9bda1..f664c7ba9a 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_import_public_proto3.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.cs index 56fde4f00a..e7e2b4275c 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_issue6936_a.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.cs index 1ac4a67299..21232fbd62 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_issue6936_b.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.cs index d7789b87ac..cb53b7a19f 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_issue6936_c.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs index 3440105514..3fe2dd68ab 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_issues.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs index 1af0d9e3f6..ddb73d779d 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_proto3.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3Optional.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3Optional.cs index a41b890fc6..4502ffaa12 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3Optional.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3Optional.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/unittest_proto3_optional.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestSelfreferentialOptions.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestSelfreferentialOptions.cs index 7a8f72d4bb..e1118c96c4 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestSelfreferentialOptions.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestSelfreferentialOptions.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: unittest_selfreferential_options.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs index 58e866e766..3ec8d3556f 100644 --- a/csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs +++ b/csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/unittest_well_known_types.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs index 5967a4fef0..1cb43c0ea3 100644 --- a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/descriptor.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs index 13066da3fe..d0ce71b1d3 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/any.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs index 58a658e077..c524031e34 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/api.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs index b46f4d2936..576ef2e608 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/duration.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs index 08f4a849de..43d2b74903 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/empty.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs index e90c3d571d..19e0e6e41b 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/field_mask.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs index 58c23cea1d..6edd4f1399 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/source_context.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs index 123d80ac93..8c1eec53b4 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/struct.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs index e981dc2a01..e6d57afd55 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/timestamp.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs index 120f31a90a..3088e385db 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/type.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs index 29c04b36b4..307a446f07 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs @@ -2,7 +2,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: google/protobuf/wrappers.proto // -#pragma warning disable 1591, 0612, 3021 +#pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code using pb = global::Google.Protobuf; From 1fa42c4be4b6d937c5903c6864e3f6d4a09614b9 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 19 May 2022 13:35:48 -0700 Subject: [PATCH 09/14] Updating version.json and repo version numbers to: 21.0-rc2 --- Protobuf-C++.podspec | 4 ++-- Protobuf.podspec | 4 ++-- configure.ac | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/README.md | 6 +++--- java/bom/pom.xml | 2 +- java/core/pom.xml | 2 +- java/kotlin-lite/pom.xml | 2 +- java/kotlin/pom.xml | 2 +- java/lite.md | 2 +- java/lite/pom.xml | 2 +- java/pom.xml | 2 +- java/util/pom.xml | 2 +- php/ext/google/protobuf/package.xml | 21 ++++++++++++++++--- php/ext/google/protobuf/protobuf.h | 2 +- protobuf_version.bzl | 6 +++--- protoc-artifacts/pom.xml | 2 +- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- ruby/pom.xml | 4 ++-- src/google/protobuf/port_def.inc | 2 +- src/google/protobuf/stubs/common.h | 2 +- version.json | 20 +++++++++--------- 24 files changed, 57 insertions(+), 42 deletions(-) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 9d8815a8c8..1297ad3e82 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '3.21.0-rc1' + s.version = '3.21.0-rc2' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = 'BSD-3-Clause' @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.cocoapods_version = '>= 1.0' s.source = { :git => 'https://github.com/google/protobuf.git', - :tag => "v#{s.version}" } + :tag => "v21.0-rc2" } s.source_files = 'src/google/protobuf/*.{h,cc,inc}', 'src/google/protobuf/stubs/*.{h,cc}', diff --git a/Protobuf.podspec b/Protobuf.podspec index 37d7fc9a9d..643635d8bd 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -5,7 +5,7 @@ # dependent projects use the :git notation to refer to the library. Pod::Spec.new do |s| s.name = 'Protobuf' - s.version = '3.21.0-rc1' + s.version = '3.21.0-rc2' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = 'BSD-3-Clause' @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.cocoapods_version = '>= 1.0' s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git', - :tag => "v#{s.version}" } + :tag => "v21.0-rc2" } s.source_files = 'objectivec/*.{h,m}', 'objectivec/google/protobuf/Any.pbobjc.h', diff --git a/configure.ac b/configure.ac index 7cf520012a..61246b27be 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.59) # In the SVN trunk, the version should always be the next anticipated release # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[3.21.0-rc-1],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.21.0-rc-2],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 25c0609b40..92a860ee81 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ Google Protocol Buffers tools Tools for Protocol Buffers - Google's data interchange format. See project site for more info. - 3.21.0-rc1 + 3.21.0-rc2 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/main/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 40986da945..d634551328 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -4,7 +4,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.21.0-rc1 + 3.21.0-rc2 7.2 Google Inc. diff --git a/java/README.md b/java/README.md index 41cbc869e9..1fbc624c53 100644 --- a/java/README.md +++ b/java/README.md @@ -23,7 +23,7 @@ If you are using Maven, use the following: com.google.protobuf protobuf-java - 3.21.0-rc-1 + 3.21.0-rc-2 ``` @@ -37,7 +37,7 @@ protobuf-java-util package: com.google.protobuf protobuf-java-util - 3.21.0-rc-1 + 3.21.0-rc-2 ``` @@ -45,7 +45,7 @@ protobuf-java-util package: If you are using Gradle, add the following to your `build.gradle` file's dependencies: ``` - implementation 'com.google.protobuf:protobuf-java:3.21.0-rc-1' + implementation 'com.google.protobuf:protobuf-java:3.21.0-rc-2' ``` Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using. diff --git a/java/bom/pom.xml b/java/bom/pom.xml index ce950a2095..a770cbb9fe 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.21.0-rc-1 + 3.21.0-rc-2 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 8a33a507ae..bffa2958b4 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.0-rc-1 + 3.21.0-rc-2 protobuf-java diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index a4737d8296..fd3734d36a 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.0-rc-1 + 3.21.0-rc-2 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index a3f66409bd..c9eeb6d79b 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.0-rc-1 + 3.21.0-rc-2 protobuf-kotlin diff --git a/java/lite.md b/java/lite.md index fd6c163c1f..633478b4a1 100644 --- a/java/lite.md +++ b/java/lite.md @@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following: com.google.protobuf protobuf-javalite - 3.21.0-rc-1 + 3.21.0-rc-2 ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index d62c1b375e..c10edfd444 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.0-rc-1 + 3.21.0-rc-2 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index a1d6ab06d2..467c06d0b1 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.0-rc-1 + 3.21.0-rc-2 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index f20e1e5c58..a12fd2226f 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.0-rc-1 + 3.21.0-rc-2 protobuf-java-util diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index d1d5d87d20..deda5c5b47 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -10,10 +10,10 @@ protobuf-opensource@google.com yes - 2022-05-10 - + 2022-05-19 + - 3.21.0RC1 + 3.21.0RC2 3.21.0 @@ -1298,5 +1298,20 @@ G A release. + + + 3.21.0RC2 + 3.21.0 + + + beta + beta + + 2022-05-19 + + BSD-3-Clause + + + diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 292a0eeca0..f95179b053 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -127,7 +127,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define PHP_PROTOBUF_VERSION "3.21.0RC1" +#define PHP_PROTOBUF_VERSION "3.21.0RC2" // ptr -> PHP object cache. This is a weak map that caches lazily-created // wrapper objects around upb types: diff --git a/protobuf_version.bzl b/protobuf_version.bzl index 94e2247452..5725bdd6c3 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl @@ -1,3 +1,3 @@ -PROTOC_VERSION = '21.0-rc-1' -PROTOBUF_JAVA_VERSION = '3.21.0-rc-1' -PROTOBUF_PYTHON_VERSION = '4.21.0-rc-1' +PROTOC_VERSION = '21.0-rc-2' +PROTOBUF_JAVA_VERSION = '3.21.0-rc-2' +PROTOBUF_PYTHON_VERSION = '4.21.0-rc-2' diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 45c2123f13..80451f9716 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 21.0-rc-1 + 3.21.0-rc-2 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 49039d5e12..bd2faa4e5a 100644 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,4 +30,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '4.21.0rc1' +__version__ = '4.21.0rc2' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index ff55b64275..f86cda7656 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.21.0.rc.1" + s.version = "3.21.0.rc.2" git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" diff --git a/ruby/pom.xml b/ruby/pom.xml index 0d53cd1f35..0514dbe6e6 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 3.21.0-rc-1 + 3.21.0-rc-2 Protocol Buffer JRuby native extension Protocol Buffers are a way of encoding structured data in an efficient yet @@ -76,7 +76,7 @@ com.google.protobuf protobuf-java-util - 3.21.0-rc-1 + 3.21.0-rc-2 org.jruby diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 033563090e..78b97e6cca 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -193,7 +193,7 @@ #ifdef PROTOBUF_VERSION_SUFFIX #error PROTOBUF_VERSION_SUFFIX was previously defined #endif -#define PROTOBUF_VERSION_SUFFIX "-rc1" +#define PROTOBUF_VERSION_SUFFIX "-rc2" #if defined(PROTOBUF_NAMESPACE) || defined(PROTOBUF_NAMESPACE_ID) #error PROTOBUF_NAMESPACE or PROTOBUF_NAMESPACE_ID was previously defined diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 8b581ba63a..36a4b08e41 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -85,7 +85,7 @@ namespace internal { #define GOOGLE_PROTOBUF_VERSION 3021000 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc2" // The minimum header version which works with the current version of // the library. This constant should only be used by protoc's C++ code diff --git a/version.json b/version.json index 21379503c7..a007aba97e 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "21.x": { - "protoc_version": "21.0-dev", + "protoc_version": "21.0-rc2", "lts": false, - "date": "2022-05-13", + "date": "2022-05-19", "languages": { - "cpp": "3.21.0-dev", - "csharp": "3.21.0-dev", - "java": "3.21.0-dev", - "javascript": "3.21.0-dev", - "objectivec": "3.21.0-dev", - "php": "3.21.0-dev", - "python": "4.21.0-dev", - "ruby": "3.21.0-dev" + "cpp": "3.21.0-rc2", + "csharp": "3.21.0-rc2", + "java": "3.21.0-rc2", + "javascript": "3.21.0-rc2", + "objectivec": "3.21.0-rc2", + "php": "3.21.0-rc2", + "python": "4.21.0-rc2", + "ruby": "3.21.0-rc2" } } } \ No newline at end of file From 71271ad1f8d95d33f7fa7c70df0cf42e28117320 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Thu, 19 May 2022 20:42:46 +0000 Subject: [PATCH 10/14] Edit changelog --- CHANGES.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 3c6bc35107..889fa0c65a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,23 @@ +2022-05-19 version 21.0-rc2(C++/Java/Python/PHP/Objective-C/C#/Ruby) + + Python + * Fix windows builds + * Throw more helpful error if generated code is out of date + * Fixed two reference leaks + + Ruby + * Support x64-mingw-ucrt platform + + PHP + * Fix SEGV by not writing to shared memory for zend_class_entry + + C# + * Suppress warning CS8981 + + Other + * Fix Maven release to release actual osx_aarch64 binary + * Fix protoc zips to have the proto files for well known types + 2022-05-10 version 21.0-rc1 (C++/Java/Python/PHP/Objective-C/C#/Ruby) C++ From ecaeadecedc85bbaae2b7e051cc4ff40306d72ee Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Fri, 20 May 2022 00:38:39 +0000 Subject: [PATCH 11/14] Update version.json to: 21.0-dev --- version.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/version.json b/version.json index a007aba97e..7c47bbc5b1 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "21.x": { - "protoc_version": "21.0-rc2", + "protoc_version": "21.0-dev", "lts": false, - "date": "2022-05-19", + "date": "2022-05-20", "languages": { - "cpp": "3.21.0-rc2", - "csharp": "3.21.0-rc2", - "java": "3.21.0-rc2", - "javascript": "3.21.0-rc2", - "objectivec": "3.21.0-rc2", - "php": "3.21.0-rc2", - "python": "4.21.0-rc2", - "ruby": "3.21.0-rc2" + "cpp": "3.21.0-dev", + "csharp": "3.21.0-dev", + "java": "3.21.0-dev", + "javascript": "3.21.0-dev", + "objectivec": "3.21.0-dev", + "php": "3.21.0-dev", + "python": "4.21.0-dev", + "ruby": "3.21.0-dev" } } } \ No newline at end of file From 1407efb39f6664e9caf1b7170ab240183d55a204 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Fri, 20 May 2022 17:45:47 +0000 Subject: [PATCH 12/14] Fix merge conflict --- BUILD.bazel | 211 ---------------------------------------------------- 1 file changed, 211 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index e634a09b36..98584b6042 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -12,217 +12,6 @@ licenses(["notice"]) exports_files(["LICENSE"]) -################################################################################ -# Protobuf Runtime Library -################################################################################ - -cc_library( - name = "protobuf_lite", - srcs = [ - # AUTOGEN(protobuf_lite_srcs) - "src/google/protobuf/any_lite.cc", - "src/google/protobuf/arena.cc", - "src/google/protobuf/arenastring.cc", - "src/google/protobuf/arenaz_sampler.cc", - "src/google/protobuf/extension_set.cc", - "src/google/protobuf/generated_enum_util.cc", - "src/google/protobuf/generated_message_tctable_lite.cc", - "src/google/protobuf/generated_message_util.cc", - "src/google/protobuf/implicit_weak_message.cc", - "src/google/protobuf/inlined_string_field.cc", - "src/google/protobuf/io/coded_stream.cc", - "src/google/protobuf/io/io_win32.cc", - "src/google/protobuf/io/strtod.cc", - "src/google/protobuf/io/zero_copy_stream.cc", - "src/google/protobuf/io/zero_copy_stream_impl.cc", - "src/google/protobuf/io/zero_copy_stream_impl_lite.cc", - "src/google/protobuf/map.cc", - "src/google/protobuf/message_lite.cc", - "src/google/protobuf/parse_context.cc", - "src/google/protobuf/repeated_field.cc", - "src/google/protobuf/repeated_ptr_field.cc", - "src/google/protobuf/stubs/bytestream.cc", - "src/google/protobuf/stubs/common.cc", - "src/google/protobuf/stubs/int128.cc", - "src/google/protobuf/stubs/status.cc", - "src/google/protobuf/stubs/statusor.cc", - "src/google/protobuf/stubs/stringpiece.cc", - "src/google/protobuf/stubs/stringprintf.cc", - "src/google/protobuf/stubs/structurally_valid.cc", - "src/google/protobuf/stubs/strutil.cc", - "src/google/protobuf/stubs/time.cc", - "src/google/protobuf/wire_format_lite.cc", - ], - hdrs = glob([ - "src/google/protobuf/**/*.h", - "src/google/protobuf/**/*.inc", - ]), - copts = COPTS, - includes = ["src/"], - linkopts = LINK_OPTS, - visibility = ["//visibility:public"], -) - -cc_library( - name = "protobuf", - srcs = [ - # AUTOGEN(protobuf_srcs) - "src/google/protobuf/any.cc", - "src/google/protobuf/any.pb.cc", - "src/google/protobuf/api.pb.cc", - "src/google/protobuf/compiler/importer.cc", - "src/google/protobuf/compiler/parser.cc", - "src/google/protobuf/descriptor.cc", - "src/google/protobuf/descriptor.pb.cc", - "src/google/protobuf/descriptor_database.cc", - "src/google/protobuf/duration.pb.cc", - "src/google/protobuf/dynamic_message.cc", - "src/google/protobuf/empty.pb.cc", - "src/google/protobuf/extension_set_heavy.cc", - "src/google/protobuf/field_mask.pb.cc", - "src/google/protobuf/generated_message_bases.cc", - "src/google/protobuf/generated_message_reflection.cc", - "src/google/protobuf/generated_message_tctable_full.cc", - "src/google/protobuf/io/gzip_stream.cc", - "src/google/protobuf/io/printer.cc", - "src/google/protobuf/io/tokenizer.cc", - "src/google/protobuf/map_field.cc", - "src/google/protobuf/message.cc", - "src/google/protobuf/reflection_ops.cc", - "src/google/protobuf/service.cc", - "src/google/protobuf/source_context.pb.cc", - "src/google/protobuf/struct.pb.cc", - "src/google/protobuf/stubs/substitute.cc", - "src/google/protobuf/text_format.cc", - "src/google/protobuf/timestamp.pb.cc", - "src/google/protobuf/type.pb.cc", - "src/google/protobuf/unknown_field_set.cc", - "src/google/protobuf/util/delimited_message_util.cc", - "src/google/protobuf/util/field_comparator.cc", - "src/google/protobuf/util/field_mask_util.cc", - "src/google/protobuf/util/internal/datapiece.cc", - "src/google/protobuf/util/internal/default_value_objectwriter.cc", - "src/google/protobuf/util/internal/error_listener.cc", - "src/google/protobuf/util/internal/field_mask_utility.cc", - "src/google/protobuf/util/internal/json_escaping.cc", - "src/google/protobuf/util/internal/json_objectwriter.cc", - "src/google/protobuf/util/internal/json_stream_parser.cc", - "src/google/protobuf/util/internal/object_writer.cc", - "src/google/protobuf/util/internal/proto_writer.cc", - "src/google/protobuf/util/internal/protostream_objectsource.cc", - "src/google/protobuf/util/internal/protostream_objectwriter.cc", - "src/google/protobuf/util/internal/type_info.cc", - "src/google/protobuf/util/internal/utility.cc", - "src/google/protobuf/util/json_util.cc", - "src/google/protobuf/util/message_differencer.cc", - "src/google/protobuf/util/time_util.cc", - "src/google/protobuf/util/type_resolver_util.cc", - "src/google/protobuf/wire_format.cc", - "src/google/protobuf/wrappers.pb.cc", - ], - hdrs = glob([ - "src/**/*.h", - "src/**/*.inc", - ]), - copts = COPTS, - includes = ["src/"], - linkopts = LINK_OPTS, - visibility = ["//visibility:public"], - deps = [":protobuf_lite"] + select({ - "//build_defs:config_msvc": [], - "//conditions:default": ["@zlib//:zlib"], - }), -) - -# This provides just the header files for use in projects that need to build -# shared libraries for dynamic loading. This target is available until Bazel -# adds native support for such use cases. -# TODO(keveman): Remove this target once the support gets added to Bazel. -cc_library( - name = "protobuf_headers", - hdrs = glob([ - "src/**/*.h", - "src/**/*.inc", - ]), - includes = ["src/"], - visibility = ["//visibility:public"], -) - -filegroup( - name = "well_known_type_protos", - srcs = [ - "src/google/protobuf/any.proto", - "src/google/protobuf/api.proto", - "src/google/protobuf/duration.proto", - "src/google/protobuf/empty.proto", - "src/google/protobuf/field_mask.proto", - "src/google/protobuf/source_context.proto", - "src/google/protobuf/struct.proto", - "src/google/protobuf/timestamp.proto", - "src/google/protobuf/type.proto", - "src/google/protobuf/wrappers.proto", - ], - visibility = ["//visibility:public"], -) - -filegroup( - name = "built_in_runtime_protos", - srcs = [ - "src/google/protobuf/compiler/plugin.proto", - "src/google/protobuf/descriptor.proto", - ], - visibility = ["//:__subpackages__"], -) - -exports_files( - srcs = [ - "src/google/protobuf/any.proto", - "src/google/protobuf/api.proto", - "src/google/protobuf/compiler/plugin.proto", - "src/google/protobuf/descriptor.proto", - "src/google/protobuf/duration.proto", - "src/google/protobuf/empty.proto", - "src/google/protobuf/field_mask.proto", - "src/google/protobuf/source_context.proto", - "src/google/protobuf/struct.proto", - "src/google/protobuf/timestamp.proto", - "src/google/protobuf/type.proto", - "src/google/protobuf/wrappers.proto", - ], - visibility = ["//pkg:__pkg__"], -) - -alias( - name = "lite_well_known_protos", - actual = ":well_known_type_protos", - visibility = ["//visibility:public"], -) - -adapt_proto_library( - name = "cc_wkt_protos_genproto", - visibility = ["//visibility:public"], - deps = [ - "//:any_proto", - "//:api_proto", - "//:compiler_plugin_proto", - "//:descriptor_proto", - "//:duration_proto", - "//:empty_proto", - "//:field_mask_proto", - "//:source_context_proto", - "//:struct_proto", - "//:timestamp_proto", - "//:type_proto", - "//:wrappers_proto", - ], -) - -cc_library( - name = "cc_wkt_protos", - deprecation = "Only for backward compatibility. Do not use.", - visibility = ["//visibility:public"], -) - ################################################################################ # Well Known Types Proto Library Rules # From cdfd60f63d641036f0223db93465b2a79fe56db5 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Fri, 20 May 2022 18:03:26 +0000 Subject: [PATCH 13/14] Fix podspec errors --- Protobuf-C++.podspec | 4 ++-- Protobuf.podspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 1297ad3e82..9d8815a8c8 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '3.21.0-rc2' + s.version = '3.21.0-rc1' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = 'BSD-3-Clause' @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.cocoapods_version = '>= 1.0' s.source = { :git => 'https://github.com/google/protobuf.git', - :tag => "v21.0-rc2" } + :tag => "v#{s.version}" } s.source_files = 'src/google/protobuf/*.{h,cc,inc}', 'src/google/protobuf/stubs/*.{h,cc}', diff --git a/Protobuf.podspec b/Protobuf.podspec index 643635d8bd..37d7fc9a9d 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -5,7 +5,7 @@ # dependent projects use the :git notation to refer to the library. Pod::Spec.new do |s| s.name = 'Protobuf' - s.version = '3.21.0-rc2' + s.version = '3.21.0-rc1' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = 'BSD-3-Clause' @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.cocoapods_version = '>= 1.0' s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git', - :tag => "v21.0-rc2" } + :tag => "v#{s.version}" } s.source_files = 'objectivec/*.{h,m}', 'objectivec/google/protobuf/Any.pbobjc.h', From 38f0bd4d152f2965ff7a6e21a7e5e029c1bde435 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Fri, 20 May 2022 21:28:55 +0000 Subject: [PATCH 14/14] Fix bazel builds --- pkg/BUILD.bazel | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel index 93d816ea9d..f30c8367cf 100644 --- a/pkg/BUILD.bazel +++ b/pkg/BUILD.bazel @@ -17,17 +17,8 @@ package_naming( pkg_files( name = "wkt_protos_files", srcs = [ - "//:src/google/protobuf/any.proto", - "//:src/google/protobuf/api.proto", - "//:src/google/protobuf/descriptor.proto", - "//:src/google/protobuf/duration.proto", - "//:src/google/protobuf/empty.proto", - "//:src/google/protobuf/field_mask.proto", - "//:src/google/protobuf/source_context.proto", - "//:src/google/protobuf/struct.proto", - "//:src/google/protobuf/timestamp.proto", - "//:src/google/protobuf/type.proto", - "//:src/google/protobuf/wrappers.proto", + "//:well_known_type_protos", + "//src/google/protobuf:descriptor_proto_srcs", ], prefix = "include/google/protobuf", visibility = ["//visibility:private"], @@ -35,7 +26,9 @@ pkg_files( pkg_files( name = "compiler_plugin_protos_files", - srcs = ["//:src/google/protobuf/compiler/plugin.proto"], + srcs = [ + "//src/google/protobuf/compiler:compiler_plugin_protos_files", + ], prefix = "include/google/protobuf/compiler", visibility = ["//visibility:private"], ) @@ -76,11 +69,9 @@ pkg_zip( name = "protoc_release", srcs = [ ":compiler_plugin_protos_files", - ":descriptor_protos_files", ":protoc_files", ":protoc_readme", ":wkt_protos_files", - "//src/google/protobuf/compiler:compiler_plugin_protos_files", ], package_file_name = "protoc-{version}-{platform}.zip", package_variables = ":protobuf_pkg_naming",