From 233098326bc268fc03b28725c941519fc77703e6 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 17 Dec 2024 12:18:27 -0800 Subject: [PATCH 1/2] Updating version.json and repo version numbers to: 29.2 --- MODULE.bazel | 2 +- .../com/google/protobuf/RuntimeVersion.java | 2 +- python/google/protobuf/runtime_version.py | 2 +- src/google/protobuf/any.pb.cc | 2 +- src/google/protobuf/any.pb.h | 2 +- src/google/protobuf/api.pb.cc | 2 +- src/google/protobuf/api.pb.h | 2 +- .../compiler/java/java_features.pb.cc | 2 +- .../protobuf/compiler/java/java_features.pb.h | 2 +- src/google/protobuf/compiler/plugin.pb.cc | 2 +- src/google/protobuf/compiler/plugin.pb.h | 2 +- src/google/protobuf/compiler/versions.h | 6 +++--- src/google/protobuf/cpp_features.pb.cc | 2 +- src/google/protobuf/cpp_features.pb.h | 2 +- src/google/protobuf/descriptor.pb.cc | 2 +- src/google/protobuf/descriptor.pb.h | 2 +- src/google/protobuf/duration.pb.cc | 2 +- src/google/protobuf/duration.pb.h | 2 +- src/google/protobuf/empty.pb.cc | 2 +- src/google/protobuf/empty.pb.h | 2 +- src/google/protobuf/field_mask.pb.cc | 2 +- src/google/protobuf/field_mask.pb.h | 2 +- src/google/protobuf/runtime_version.h | 2 +- src/google/protobuf/source_context.pb.cc | 2 +- src/google/protobuf/source_context.pb.h | 2 +- src/google/protobuf/struct.pb.cc | 2 +- src/google/protobuf/struct.pb.h | 2 +- src/google/protobuf/stubs/common.h | 2 +- src/google/protobuf/timestamp.pb.cc | 2 +- src/google/protobuf/timestamp.pb.h | 2 +- src/google/protobuf/type.pb.cc | 2 +- src/google/protobuf/type.pb.h | 2 +- src/google/protobuf/wrappers.pb.cc | 2 +- src/google/protobuf/wrappers.pb.h | 2 +- version.json | 20 +++++++++---------- 35 files changed, 46 insertions(+), 46 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index aa9e8b2104a9a..3c3f051adeccc 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,7 +3,7 @@ module( name = "protobuf", - version = "29.2-dev", # Automatically updated on release + version = "29.2", # Automatically updated on release compatibility_level = 1, repo_name = "com_google_protobuf", ) diff --git a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java index 04f4a78ff6a1b..019314b7bc361 100644 --- a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java +++ b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java @@ -29,7 +29,7 @@ public enum RuntimeDomain { public static final int OSS_MAJOR = 4; public static final int OSS_MINOR = 29; public static final int OSS_PATCH = 2; - public static final String OSS_SUFFIX = "-dev"; + public static final String OSS_SUFFIX = ""; public static final RuntimeDomain DOMAIN = OSS_DOMAIN; public static final int MAJOR = OSS_MAJOR; diff --git a/python/google/protobuf/runtime_version.py b/python/google/protobuf/runtime_version.py index a91657b2954e0..50c1fed933303 100644 --- a/python/google/protobuf/runtime_version.py +++ b/python/google/protobuf/runtime_version.py @@ -30,7 +30,7 @@ class Domain(Enum): OSS_MAJOR = 5 OSS_MINOR = 29 OSS_PATCH = 2 -OSS_SUFFIX = '-dev' +OSS_SUFFIX = '' DOMAIN = OSS_DOMAIN MAJOR = OSS_MAJOR diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index f3cb711da7a7e..2a8112562dfcc 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/any.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/any.pb.h" diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 52b8a9c5af220..283dd58442c4c 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/any.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fany_2eproto_2epb_2eh #define google_2fprotobuf_2fany_2eproto_2epb_2eh diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index 6064d1471a235..151fcf9fe4b82 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/api.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/api.pb.h" diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 31032dc7e0b09..9c14580ecdd01 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/api.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fapi_2eproto_2epb_2eh #define google_2fprotobuf_2fapi_2eproto_2epb_2eh diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc index c17fb84101144..8956f1a4c0ac3 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.cc +++ b/src/google/protobuf/compiler/java/java_features.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/compiler/java/java_features.pb.h" diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index 5c59062db579b..df112ad97d951 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh #define google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index 8e551d87476cc..f1e48d5556d26 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/compiler/plugin.pb.h" diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index c5e96a9d2d124..d36921bd24d7c 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh #define google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh diff --git a/src/google/protobuf/compiler/versions.h b/src/google/protobuf/compiler/versions.h index b592da39298df..c970885d40fd9 100644 --- a/src/google/protobuf/compiler/versions.h +++ b/src/google/protobuf/compiler/versions.h @@ -53,9 +53,9 @@ // // Please avoid changing them manually, as they should be updated automatically // by Protobuf release process. -#define PROTOBUF_CPP_VERSION_STRING "5.29.2-dev" -#define PROTOBUF_JAVA_VERSION_STRING "4.29.2-dev" -#define PROTOBUF_PYTHON_VERSION_STRING "5.29.2-dev" +#define PROTOBUF_CPP_VERSION_STRING "5.29.2" +#define PROTOBUF_JAVA_VERSION_STRING "4.29.2" +#define PROTOBUF_PYTHON_VERSION_STRING "5.29.2" namespace google { diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index d08ec249a14c9..dfdec5f18cf40 100644 --- a/src/google/protobuf/cpp_features.pb.cc +++ b/src/google/protobuf/cpp_features.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/cpp_features.pb.h" diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index 85f23312beccf..86a8f7a032417 100644 --- a/src/google/protobuf/cpp_features.pb.h +++ b/src/google/protobuf/cpp_features.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh #define google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 5b671a420edd8..ee035bf5e8bc0 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/descriptor.pb.h" diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index ee33ad3d1f9e1..e28701b49b6ee 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh #define google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index a7c122a95bf0c..c6510090e7b16 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/duration.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/duration.pb.h" diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 077730f2485fd..b236db4ce7e79 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/duration.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fduration_2eproto_2epb_2eh #define google_2fprotobuf_2fduration_2eproto_2epb_2eh diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc index 72bf6dc2839a6..cee7d641ccaf4 100644 --- a/src/google/protobuf/empty.pb.cc +++ b/src/google/protobuf/empty.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/empty.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/empty.pb.h" diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 072f4a963fbc0..6bac5a98b5116 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/empty.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fempty_2eproto_2epb_2eh #define google_2fprotobuf_2fempty_2eproto_2epb_2eh diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 4c4a0993ff3ca..37df90f028556 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/field_mask.pb.h" diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 1154ad3b63354..a5e70fc253f93 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh #define google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh diff --git a/src/google/protobuf/runtime_version.h b/src/google/protobuf/runtime_version.h index 32fdb630130af..a65328d8d0440 100644 --- a/src/google/protobuf/runtime_version.h +++ b/src/google/protobuf/runtime_version.h @@ -19,7 +19,7 @@ // The OSS versions are not stripped to avoid merging conflicts. #define PROTOBUF_OSS_VERSION 5029002 -#define PROTOBUF_OSS_VERSION_SUFFIX "-dev" +#define PROTOBUF_OSS_VERSION_SUFFIX "" #define PROTOBUF_VERSION PROTOBUF_OSS_VERSION #define PROTOBUF_VERSION_SUFFIX PROTOBUF_OSS_VERSION_SUFFIX diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index a81368a70acc0..626bca4409ea0 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/source_context.pb.h" diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index d2758fa5dff71..09cb3da86f801 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh #define google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index 592bafac82b81..b51da2754d52e 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/struct.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/struct.pb.h" diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 0fda4da7a67e0..6cc3149c6877a 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/struct.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fstruct_2eproto_2epb_2eh #define google_2fprotobuf_2fstruct_2eproto_2epb_2eh diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 93694ef801e3a..4889760c0c042 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -48,7 +48,7 @@ namespace internal { #define GOOGLE_PROTOBUF_VERSION 5029002 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-dev" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" // Verifies that the protobuf version a program was compiled with matches what // it is linked/running with. Use the macro below to call this function. diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index 6a6c3cbcbee87..4539a40b52d04 100644 --- a/src/google/protobuf/timestamp.pb.cc +++ b/src/google/protobuf/timestamp.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/timestamp.pb.h" diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 12fecf20ce106..a94079e041f04 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh #define google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 36e99a95958d7..9d49dc69b3b74 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/type.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/type.pb.h" diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 19ea165158cea..efc4f67d3ee68 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/type.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2ftype_2eproto_2epb_2eh #define google_2fprotobuf_2ftype_2eproto_2epb_2eh diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index 4279751e86720..eff7249d591a4 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #include "google/protobuf/wrappers.pb.h" diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index a147edce5ce30..6d93622f91395 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 5.29.2-dev +// Protobuf C++ Version: 5.29.2 #ifndef google_2fprotobuf_2fwrappers_2eproto_2epb_2eh #define google_2fprotobuf_2fwrappers_2eproto_2epb_2eh diff --git a/version.json b/version.json index ca5e00acffff5..6e01a5d23ba54 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "29.x": { - "protoc_version": "29.2-dev", + "protoc_version": "29.2", "lts": false, - "date": "2024-12-03", + "date": "2024-12-17", "languages": { - "cpp": "5.29.2-dev", - "csharp": "3.29.2-dev", - "java": "4.29.2-dev", - "javascript": "3.29.2-dev", - "objectivec": "3.29.2-dev", - "php": "4.29.2-dev", - "python": "5.29.2-dev", - "ruby": "4.29.2-dev" + "cpp": "5.29.2", + "csharp": "3.29.2", + "java": "4.29.2", + "javascript": "3.29.2", + "objectivec": "3.29.2", + "php": "4.29.2", + "python": "5.29.2", + "ruby": "4.29.2" } } } \ No newline at end of file From 5621748f97259be36587bf337aae554f6361cb22 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 17 Dec 2024 12:18:28 -0800 Subject: [PATCH 2/2] Updating version.json and repo version numbers to: 29.3-dev --- CMakeLists.txt | 2 +- MODULE.bazel | 2 +- Protobuf-C++.podspec | 2 +- Protobuf.podspec | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../src/Google.Protobuf/Google.Protobuf.csproj | 2 +- java/bom/pom.xml | 2 +- .../com/google/protobuf/RuntimeVersion.java | 4 ++-- java/kotlin/pom.xml | 2 +- java/pom.xml | 2 +- java/protoc/pom.xml | 2 +- php/ext/google/protobuf/protobuf.h | 2 +- protobuf_version.bzl | 10 +++++----- python/google/protobuf/__init__.py | 2 +- python/google/protobuf/runtime_version.py | 4 ++-- ruby/google-protobuf.gemspec | 2 +- ruby/pom.xml | 4 ++-- src/google/protobuf/any.pb.cc | 2 +- src/google/protobuf/any.pb.h | 4 ++-- src/google/protobuf/api.pb.cc | 2 +- src/google/protobuf/api.pb.h | 4 ++-- .../protobuf/compiler/java/java_features.pb.cc | 2 +- .../protobuf/compiler/java/java_features.pb.h | 4 ++-- src/google/protobuf/compiler/plugin.pb.cc | 2 +- src/google/protobuf/compiler/plugin.pb.h | 4 ++-- src/google/protobuf/compiler/versions.h | 6 +++--- src/google/protobuf/cpp_features.pb.cc | 2 +- src/google/protobuf/cpp_features.pb.h | 4 ++-- src/google/protobuf/descriptor.pb.cc | 2 +- src/google/protobuf/descriptor.pb.h | 4 ++-- src/google/protobuf/duration.pb.cc | 2 +- src/google/protobuf/duration.pb.h | 4 ++-- src/google/protobuf/empty.pb.cc | 2 +- src/google/protobuf/empty.pb.h | 4 ++-- src/google/protobuf/field_mask.pb.cc | 2 +- src/google/protobuf/field_mask.pb.h | 4 ++-- src/google/protobuf/runtime_version.h | 4 ++-- src/google/protobuf/source_context.pb.cc | 2 +- src/google/protobuf/source_context.pb.h | 4 ++-- src/google/protobuf/struct.pb.cc | 2 +- src/google/protobuf/struct.pb.h | 4 ++-- src/google/protobuf/stubs/common.h | 4 ++-- src/google/protobuf/timestamp.pb.cc | 2 +- src/google/protobuf/timestamp.pb.h | 4 ++-- src/google/protobuf/type.pb.cc | 2 +- src/google/protobuf/type.pb.h | 4 ++-- src/google/protobuf/wrappers.pb.cc | 2 +- src/google/protobuf/wrappers.pb.h | 4 ++-- version.json | 18 +++++++++--------- 49 files changed, 82 insertions(+), 82 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 827f6f91ad1dd..878ef2e3d183f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,7 @@ if (protobuf_BUILD_SHARED_LIBS) endif () # Version metadata -set(protobuf_VERSION_STRING "5.29.2") +set(protobuf_VERSION_STRING "5.29.3") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/MODULE.bazel b/MODULE.bazel index 3c3f051adeccc..22084f92c7673 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,7 +3,7 @@ module( name = "protobuf", - version = "29.2", # Automatically updated on release + version = "29.3-dev", # Automatically updated on release compatibility_level = 1, repo_name = "com_google_protobuf", ) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index a151955ee1f38..3baf07bf4c837 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '5.29.2' + s.version = '5.29.3' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = 'BSD-3-Clause' diff --git a/Protobuf.podspec b/Protobuf.podspec index 99285f83f764a..306794e140748 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.29.2' + s.version = '3.29.3' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = 'BSD-3-Clause' diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index e2b318e43b84e..c17fd631b9caa 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.29.2 + 3.29.3 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 c539451d3539d..79dffe9bb553a 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -5,7 +5,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.29.2 + 3.29.3 10.0 Google Inc. netstandard1.1;netstandard2.0;net45;net50 diff --git a/java/bom/pom.xml b/java/bom/pom.xml index cb461058fbce4..880b7c97cc1f4 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 4.29.2 + 4.29.3 pom Protocol Buffers [BOM] diff --git a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java index 019314b7bc361..181ab425e3bd2 100644 --- a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java +++ b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java @@ -28,8 +28,8 @@ public enum RuntimeDomain { public static final RuntimeDomain OSS_DOMAIN = RuntimeDomain.PUBLIC; public static final int OSS_MAJOR = 4; public static final int OSS_MINOR = 29; - public static final int OSS_PATCH = 2; - public static final String OSS_SUFFIX = ""; + public static final int OSS_PATCH = 3; + public static final String OSS_SUFFIX = "-dev"; public static final RuntimeDomain DOMAIN = OSS_DOMAIN; public static final int MAJOR = OSS_MAJOR; diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index e2cf6cca02e74..70077d29206c5 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.29.2 + 4.29.3 protobuf-kotlin diff --git a/java/pom.xml b/java/pom.xml index 9210599160463..79329d8eb066c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.29.2 + 4.29.3 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index 4da56aa97dd59..b3720aa850782 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 4.29.2 + 4.29.3 pom Protobuf Compiler diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index d06fb247f4cdb..39f825e81620c 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -32,7 +32,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define PHP_PROTOBUF_VERSION "4.29.2" +#define PHP_PROTOBUF_VERSION "4.29.3" // 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 de593c8b03060..b5c458a9aa0c4 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl @@ -1,7 +1,7 @@ """ Contains version numbers to be used in other bzl files """ -PROTOC_VERSION = "29.2" -PROTOBUF_JAVA_VERSION = "4.29.2" -PROTOBUF_PYTHON_VERSION = "5.29.2" -PROTOBUF_PHP_VERSION = "4.29.2" -PROTOBUF_RUBY_VERSION = "4.29.2" +PROTOC_VERSION = "29.3" +PROTOBUF_JAVA_VERSION = "4.29.3" +PROTOBUF_PYTHON_VERSION = "5.29.3" +PROTOBUF_PHP_VERSION = "4.29.3" +PROTOBUF_RUBY_VERSION = "4.29.3" PROTOBUF_PREVIOUS_RELEASE = "28.0-rc1" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 2185c200b6169..92052b2806770 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -7,4 +7,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '5.29.2' +__version__ = '5.29.3' diff --git a/python/google/protobuf/runtime_version.py b/python/google/protobuf/runtime_version.py index 50c1fed933303..0ca2e67fb35ee 100644 --- a/python/google/protobuf/runtime_version.py +++ b/python/google/protobuf/runtime_version.py @@ -29,8 +29,8 @@ class Domain(Enum): OSS_DOMAIN = Domain.PUBLIC OSS_MAJOR = 5 OSS_MINOR = 29 -OSS_PATCH = 2 -OSS_SUFFIX = '' +OSS_PATCH = 3 +OSS_SUFFIX = '-dev' DOMAIN = OSS_DOMAIN MAJOR = OSS_MAJOR diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 8fa1c0d81b0df..3ce29a4b22a7b 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 = "4.29.2" + s.version = "4.29.3" 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 6410682c8e10f..1b53786a16f3e 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 4.29.2 + 4.29.3 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 - 4.29.2 + 4.29.3 org.jruby diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 2a8112562dfcc..22fef7c03d2ac 100644 --- a/src/google/protobuf/any.pb.cc +++ b/src/google/protobuf/any.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/any.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/any.pb.h" diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 283dd58442c4c..2f46a8e3945fd 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/any.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fany_2eproto_2epb_2eh #define google_2fprotobuf_2fany_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index 151fcf9fe4b82..c2f1a4cb266f4 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/api.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/api.pb.h" diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 9c14580ecdd01..e5d87f11de708 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/api.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fapi_2eproto_2epb_2eh #define google_2fprotobuf_2fapi_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc index 8956f1a4c0ac3..28f21fb159173 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.cc +++ b/src/google/protobuf/compiler/java/java_features.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/compiler/java/java_features.pb.h" diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index df112ad97d951..23736b3b67274 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/java/java_features.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh #define google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc index f1e48d5556d26..b377d77f5d7b7 100644 --- a/src/google/protobuf/compiler/plugin.pb.cc +++ b/src/google/protobuf/compiler/plugin.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/compiler/plugin.pb.h" diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index d36921bd24d7c..2abfe4664d904 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/compiler/plugin.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh #define google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/compiler/versions.h b/src/google/protobuf/compiler/versions.h index c970885d40fd9..afe53097de8c4 100644 --- a/src/google/protobuf/compiler/versions.h +++ b/src/google/protobuf/compiler/versions.h @@ -53,9 +53,9 @@ // // Please avoid changing them manually, as they should be updated automatically // by Protobuf release process. -#define PROTOBUF_CPP_VERSION_STRING "5.29.2" -#define PROTOBUF_JAVA_VERSION_STRING "4.29.2" -#define PROTOBUF_PYTHON_VERSION_STRING "5.29.2" +#define PROTOBUF_CPP_VERSION_STRING "5.29.3-dev" +#define PROTOBUF_JAVA_VERSION_STRING "4.29.3-dev" +#define PROTOBUF_PYTHON_VERSION_STRING "5.29.3-dev" namespace google { diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index dfdec5f18cf40..1d6552d13159f 100644 --- a/src/google/protobuf/cpp_features.pb.cc +++ b/src/google/protobuf/cpp_features.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/cpp_features.pb.h" diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index 86a8f7a032417..fb0e24c891b54 100644 --- a/src/google/protobuf/cpp_features.pb.h +++ b/src/google/protobuf/cpp_features.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/cpp_features.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh #define google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index ee035bf5e8bc0..67b4aba89e3cf 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/descriptor.pb.h" diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index e28701b49b6ee..ee14205340f56 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/descriptor.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh #define google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc index c6510090e7b16..056130abfbd47 100644 --- a/src/google/protobuf/duration.pb.cc +++ b/src/google/protobuf/duration.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/duration.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/duration.pb.h" diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index b236db4ce7e79..850b50ec5dcc2 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/duration.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fduration_2eproto_2epb_2eh #define google_2fprotobuf_2fduration_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/empty.pb.cc b/src/google/protobuf/empty.pb.cc index cee7d641ccaf4..bec4c47a0605d 100644 --- a/src/google/protobuf/empty.pb.cc +++ b/src/google/protobuf/empty.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/empty.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/empty.pb.h" diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 6bac5a98b5116..b135919ab39a9 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/empty.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fempty_2eproto_2epb_2eh #define google_2fprotobuf_2fempty_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 37df90f028556..1de00735ff1d7 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/field_mask.pb.h" diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index a5e70fc253f93..04b86c63f3084 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/field_mask.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh #define google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/runtime_version.h b/src/google/protobuf/runtime_version.h index a65328d8d0440..4b88c64edfef0 100644 --- a/src/google/protobuf/runtime_version.h +++ b/src/google/protobuf/runtime_version.h @@ -18,8 +18,8 @@ #endif // PROTOBUF_OSS_VERSION_SUFFIX // The OSS versions are not stripped to avoid merging conflicts. -#define PROTOBUF_OSS_VERSION 5029002 -#define PROTOBUF_OSS_VERSION_SUFFIX "" +#define PROTOBUF_OSS_VERSION 5029003 +#define PROTOBUF_OSS_VERSION_SUFFIX "-dev" #define PROTOBUF_VERSION PROTOBUF_OSS_VERSION #define PROTOBUF_VERSION_SUFFIX PROTOBUF_OSS_VERSION_SUFFIX diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index 626bca4409ea0..ee41a53a84de1 100644 --- a/src/google/protobuf/source_context.pb.cc +++ b/src/google/protobuf/source_context.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/source_context.pb.h" diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 09cb3da86f801..8cc730b8843ae 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/source_context.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh #define google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index b51da2754d52e..df42d735ee01b 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/struct.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/struct.pb.h" diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 6cc3149c6877a..94af3c113ab30 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/struct.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fstruct_2eproto_2epb_2eh #define google_2fprotobuf_2fstruct_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 4889760c0c042..6abd0eb4c3c8f 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -45,10 +45,10 @@ namespace internal { // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 5029002 +#define GOOGLE_PROTOBUF_VERSION 5029003 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-dev" // Verifies that the protobuf version a program was compiled with matches what // it is linked/running with. Use the macro below to call this function. diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index 4539a40b52d04..4eb0289293a59 100644 --- a/src/google/protobuf/timestamp.pb.cc +++ b/src/google/protobuf/timestamp.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/timestamp.pb.h" diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index a94079e041f04..2cf6ed7b26193 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/timestamp.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh #define google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 9d49dc69b3b74..708f619a1fcc7 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/type.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/type.pb.h" diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index efc4f67d3ee68..37387f8ad12a7 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/type.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2ftype_2eproto_2epb_2eh #define google_2fprotobuf_2ftype_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc index eff7249d591a4..7766118a4f0ea 100644 --- a/src/google/protobuf/wrappers.pb.cc +++ b/src/google/protobuf/wrappers.pb.cc @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #include "google/protobuf/wrappers.pb.h" diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 6d93622f91395..ad76b550b2934 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: google/protobuf/wrappers.proto -// Protobuf C++ Version: 5.29.2 +// Protobuf C++ Version: 5.29.3-dev #ifndef google_2fprotobuf_2fwrappers_2eproto_2epb_2eh #define google_2fprotobuf_2fwrappers_2eproto_2epb_2eh @@ -12,7 +12,7 @@ #include #include "google/protobuf/runtime_version.h" -#if PROTOBUF_VERSION != 5029002 +#if PROTOBUF_VERSION != 5029003 #error "Protobuf C++ gencode is built with an incompatible version of" #error "Protobuf C++ headers/runtime. See" #error "https://protobuf.dev/support/cross-version-runtime-guarantee/#cpp" diff --git a/version.json b/version.json index 6e01a5d23ba54..163c3fb14e855 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "29.x": { - "protoc_version": "29.2", + "protoc_version": "29.3-dev", "lts": false, "date": "2024-12-17", "languages": { - "cpp": "5.29.2", - "csharp": "3.29.2", - "java": "4.29.2", - "javascript": "3.29.2", - "objectivec": "3.29.2", - "php": "4.29.2", - "python": "5.29.2", - "ruby": "4.29.2" + "cpp": "5.29.3-dev", + "csharp": "3.29.3-dev", + "java": "4.29.3-dev", + "javascript": "3.29.3-dev", + "objectivec": "3.29.3-dev", + "php": "4.29.3-dev", + "python": "5.29.3-dev", + "ruby": "4.29.3-dev" } } } \ No newline at end of file