From 2d4414f384dc499af113b5991ce3eaa9df6dd931 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 27 Nov 2024 08:50:41 -0800 Subject: [PATCH 1/2] Updating version.json and repo version numbers to: 29.0 --- 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 ae7753a3c1a90..88aaac696db4e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,7 +3,7 @@ module( name = "protobuf", - version = "29.0-dev", # Automatically updated on release + version = "29.0", # 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 1c45f7cdac212..6feadec7b69e7 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 = 0; - 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 1051dc450ae5b..ceca639ac2857 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 = 0 -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 bd952ff9207eb..c131324bc9bfe 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.0-dev +// Protobuf C++ Version: 5.29.0 #include "google/protobuf/any.pb.h" diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index ebf151014e9c9..67185ebca130f 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 0cab6bd76a28b..cae1fc3c84b11 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.0-dev +// Protobuf C++ Version: 5.29.0 #include "google/protobuf/api.pb.h" diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 83cb6c4743386..ba0857f77b7b5 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 7cb5d978c0b7a..06c57bcdab40e 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 24a7f834a19bd..1a5bd2bd1262c 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 f0910bc02f758..2125670e32fd7 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 b7127f3c165c0..b399beff57772 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 cab6a59eccec0..7d424e3ce32c6 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.0-dev" -#define PROTOBUF_JAVA_VERSION_STRING "4.29.0-dev" -#define PROTOBUF_PYTHON_VERSION_STRING "5.29.0-dev" +#define PROTOBUF_CPP_VERSION_STRING "5.29.0" +#define PROTOBUF_JAVA_VERSION_STRING "4.29.0" +#define PROTOBUF_PYTHON_VERSION_STRING "5.29.0" namespace google { diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index a78b348213015..f516cbef060e6 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 9821d709c7de7..48c2a58b75ce8 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 54135eac4576b..5c45aaf8b38e0 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.0-dev +// Protobuf C++ Version: 5.29.0 #include "google/protobuf/descriptor.pb.h" diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index bcb1ed31dbcbf..a7637896a2d2d 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 a529a03241c11..6790e4abee29e 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.0-dev +// Protobuf C++ Version: 5.29.0 #include "google/protobuf/duration.pb.h" diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index e57b8a3680485..60c376c9907f7 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 8c4914e5e4cc3..c3531d15a584c 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.0-dev +// Protobuf C++ Version: 5.29.0 #include "google/protobuf/empty.pb.h" diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 9883c78c80d1c..1cae4e4c0e57b 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 f98dd6feddda3..c249e33974d16 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 5077022b59380..94e3d4d927b96 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 9d2951d7cb4da..3a6bbc9b4a947 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 5029000 -#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 58e00b7410926..7fb9fad9c6b13 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 8364089ea72c3..776142e0790c3 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 047f0949ed347..a9cce1d219704 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.0-dev +// Protobuf C++ Version: 5.29.0 #include "google/protobuf/struct.pb.h" diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 82fb54f3e961f..2171ea3b9b5a6 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 b6786afd3c70a..e7f208c22191b 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 5029000 // 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 0ae06e4db63bf..fa36cec4e8fd9 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.0-dev +// Protobuf C++ Version: 5.29.0 #include "google/protobuf/timestamp.pb.h" diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index edc62d1f23681..b3858788cec47 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 ffb974ee58cbc..01bec7a02ca17 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.0-dev +// Protobuf C++ Version: 5.29.0 #include "google/protobuf/type.pb.h" diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 305f3a27026f9..d4e826a2a98ac 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.0-dev +// Protobuf C++ Version: 5.29.0 #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 2990bcc228819..9cec1809e12fc 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.0-dev +// Protobuf C++ Version: 5.29.0 #include "google/protobuf/wrappers.pb.h" diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 32cf2233ffd49..0d85637aa1dad 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.0-dev +// Protobuf C++ Version: 5.29.0 #ifndef google_2fprotobuf_2fwrappers_2eproto_2epb_2eh #define google_2fprotobuf_2fwrappers_2eproto_2epb_2eh diff --git a/version.json b/version.json index 570dd568b9374..a2457a011baeb 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "29.x": { - "protoc_version": "29.0-dev", + "protoc_version": "29.0", "lts": false, - "date": "2024-11-18", + "date": "2024-11-27", "languages": { - "cpp": "5.29.0-dev", - "csharp": "3.29.0-dev", - "java": "4.29.0-dev", - "javascript": "3.29.0-dev", - "objectivec": "3.29.0-dev", - "php": "4.29.0-dev", - "python": "5.29.0-dev", - "ruby": "4.29.0-dev" + "cpp": "5.29.0", + "csharp": "3.29.0", + "java": "4.29.0", + "javascript": "3.29.0", + "objectivec": "3.29.0", + "php": "4.29.0", + "python": "5.29.0", + "ruby": "4.29.0" } } } \ No newline at end of file From 9e78ac7afae5fe45f56d47bf831fd7d86c99e954 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 27 Nov 2024 08:50:42 -0800 Subject: [PATCH 2/2] Updating version.json and repo version numbers to: 29.1-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 60d58eaa0f864..a3aaa49b8d8c7 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.0") +set(protobuf_VERSION_STRING "5.29.1") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/MODULE.bazel b/MODULE.bazel index 88aaac696db4e..4f4fa0fca787c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,7 +3,7 @@ module( name = "protobuf", - version = "29.0", # Automatically updated on release + version = "29.1-dev", # Automatically updated on release compatibility_level = 1, repo_name = "com_google_protobuf", ) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 3f7efdc9adba7..935bd0883e0b1 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.0' + s.version = '5.29.1' 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 ea9f7808d2a5b..680298289fa03 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.0' + s.version = '3.29.1' 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 0afe0de80f30e..f77d13051ff74 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.0 + 3.29.1 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 69fae3bc9e384..258f2366dfeb1 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.0 + 3.29.1 10.0 Google Inc. netstandard1.1;netstandard2.0;net45;net50 diff --git a/java/bom/pom.xml b/java/bom/pom.xml index f20325ebb1c22..4fd3bda052d01 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 4.29.0 + 4.29.1 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 6feadec7b69e7..227f70b8e66a4 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 = 0; - public static final String OSS_SUFFIX = ""; + public static final int OSS_PATCH = 1; + 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 a470600bf9443..fff42928120ba 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.29.0 + 4.29.1 protobuf-kotlin diff --git a/java/pom.xml b/java/pom.xml index a0bb59deb8f5b..898fe6af1c8ef 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.29.0 + 4.29.1 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index 4a9286a60bc65..ef0da2a9dea3e 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 4.29.0 + 4.29.1 pom Protobuf Compiler diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 096dd0c2ba93b..fa6574090abe7 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.0" +#define PHP_PROTOBUF_VERSION "4.29.1" // 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 b7c794893e9d6..39406377c257a 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.0" -PROTOBUF_JAVA_VERSION = "4.29.0" -PROTOBUF_PYTHON_VERSION = "5.29.0" -PROTOBUF_PHP_VERSION = "4.29.0" -PROTOBUF_RUBY_VERSION = "4.29.0" +PROTOC_VERSION = "29.1" +PROTOBUF_JAVA_VERSION = "4.29.1" +PROTOBUF_PYTHON_VERSION = "5.29.1" +PROTOBUF_PHP_VERSION = "4.29.1" +PROTOBUF_RUBY_VERSION = "4.29.1" PROTOBUF_PREVIOUS_RELEASE = "28.0-rc1" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 1c6737714ee5b..fb6c5ae63701f 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.0' +__version__ = '5.29.1' diff --git a/python/google/protobuf/runtime_version.py b/python/google/protobuf/runtime_version.py index ceca639ac2857..cf8c143509be1 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 = 0 -OSS_SUFFIX = '' +OSS_PATCH = 1 +OSS_SUFFIX = '-dev' DOMAIN = OSS_DOMAIN MAJOR = OSS_MAJOR diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 02dc094224ad7..d08e7875ff932 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.0" + s.version = "4.29.1" 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 febbb7f454670..f231418dee839 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 4.29.0 + 4.29.1 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.0 + 4.29.1 org.jruby diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index c131324bc9bfe..e92c79d6c71c1 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.0 +// Protobuf C++ Version: 5.29.1-dev #include "google/protobuf/any.pb.h" diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 67185ebca130f..dcec3b2124c6e 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 cae1fc3c84b11..f5425ae01a9ae 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.0 +// Protobuf C++ Version: 5.29.1-dev #include "google/protobuf/api.pb.h" diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index ba0857f77b7b5..51a8539704482 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 06c57bcdab40e..51308d67b9a9c 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.0 +// Protobuf C++ Version: 5.29.1-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 1a5bd2bd1262c..2c57e09d18387 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 2125670e32fd7..4e5d9b8bd9fee 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.0 +// Protobuf C++ Version: 5.29.1-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 b399beff57772..7041cdcd1ab87 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 7d424e3ce32c6..755e2ddaddd34 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.0" -#define PROTOBUF_JAVA_VERSION_STRING "4.29.0" -#define PROTOBUF_PYTHON_VERSION_STRING "5.29.0" +#define PROTOBUF_CPP_VERSION_STRING "5.29.1-dev" +#define PROTOBUF_JAVA_VERSION_STRING "4.29.1-dev" +#define PROTOBUF_PYTHON_VERSION_STRING "5.29.1-dev" namespace google { diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index f516cbef060e6..e2156f542c462 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.0 +// Protobuf C++ Version: 5.29.1-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 48c2a58b75ce8..d95dfd34c1c00 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 5c45aaf8b38e0..f14aaeba4b0e9 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.0 +// Protobuf C++ Version: 5.29.1-dev #include "google/protobuf/descriptor.pb.h" diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index a7637896a2d2d..263d10c45060b 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 6790e4abee29e..1f81205196915 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.0 +// Protobuf C++ Version: 5.29.1-dev #include "google/protobuf/duration.pb.h" diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 60c376c9907f7..2bcd23ab566bf 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 c3531d15a584c..c67b01af83d5f 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.0 +// Protobuf C++ Version: 5.29.1-dev #include "google/protobuf/empty.pb.h" diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 1cae4e4c0e57b..c84e99ab7aabf 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 c249e33974d16..3bd13156d417e 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.0 +// Protobuf C++ Version: 5.29.1-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 94e3d4d927b96..97afa554b9b41 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 3a6bbc9b4a947..cd2215192cd7a 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 5029000 -#define PROTOBUF_OSS_VERSION_SUFFIX "" +#define PROTOBUF_OSS_VERSION 5029001 +#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 7fb9fad9c6b13..e7129bff39019 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.0 +// Protobuf C++ Version: 5.29.1-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 776142e0790c3..a9b32188097fd 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 a9cce1d219704..a6f05c4fe1a95 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.0 +// Protobuf C++ Version: 5.29.1-dev #include "google/protobuf/struct.pb.h" diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 2171ea3b9b5a6..a072504008bf9 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 e7f208c22191b..230c03303e3fd 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 5029000 +#define GOOGLE_PROTOBUF_VERSION 5029001 // 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 fa36cec4e8fd9..9e516b590b668 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.0 +// Protobuf C++ Version: 5.29.1-dev #include "google/protobuf/timestamp.pb.h" diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index b3858788cec47..1e9c52e3ee88b 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 01bec7a02ca17..4314bedb56154 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.0 +// Protobuf C++ Version: 5.29.1-dev #include "google/protobuf/type.pb.h" diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index d4e826a2a98ac..651f4b4c18914 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 9cec1809e12fc..db781928d16e6 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.0 +// Protobuf C++ Version: 5.29.1-dev #include "google/protobuf/wrappers.pb.h" diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 0d85637aa1dad..60402b1aaf690 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.0 +// Protobuf C++ Version: 5.29.1-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 != 5029000 +#if PROTOBUF_VERSION != 5029001 #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 a2457a011baeb..5fcf15d91a192 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "29.x": { - "protoc_version": "29.0", + "protoc_version": "29.1-dev", "lts": false, "date": "2024-11-27", "languages": { - "cpp": "5.29.0", - "csharp": "3.29.0", - "java": "4.29.0", - "javascript": "3.29.0", - "objectivec": "3.29.0", - "php": "4.29.0", - "python": "5.29.0", - "ruby": "4.29.0" + "cpp": "5.29.1-dev", + "csharp": "3.29.1-dev", + "java": "4.29.1-dev", + "javascript": "3.29.1-dev", + "objectivec": "3.29.1-dev", + "php": "4.29.1-dev", + "python": "5.29.1-dev", + "ruby": "4.29.1-dev" } } } \ No newline at end of file