diff --git a/CMakeLists.txt b/CMakeLists.txt index ae3c3246dadc6..3e10d12dd755a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ if (protobuf_BUILD_SHARED_LIBS) endif () # Version metadata -set(protobuf_VERSION_STRING "6.30.0") +set(protobuf_VERSION_STRING "6.30.1") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/MODULE.bazel b/MODULE.bazel index f8e02e02555db..3f777b18f3852 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,7 +3,7 @@ module( name = "protobuf", - version = "30.0-dev", # Automatically updated on release + version = "30.1-dev", # Automatically updated on release compatibility_level = 1, repo_name = "com_google_protobuf", ) diff --git a/Protobuf.podspec b/Protobuf.podspec index 1ff0054ac82e2..14e66e94b4c49 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 = '4.30.0' + s.version = '4.30.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 598bb61f80ce7..d629c5628dbc3 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.30.0 + 3.30.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 2bdbb7b310f75..f02f615c3154f 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.30.0 + 3.30.1 10.0 Google Inc. netstandard1.1;netstandard2.0;net45;net50 diff --git a/java/bom/pom.xml b/java/bom/pom.xml index b182918bfab7d..608f245029b97 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 4.30.0 + 4.30.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 31c4ec29179ce..d207a8819c10f 100644 --- a/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java +++ b/java/core/src/main/java/com/google/protobuf/RuntimeVersion.java @@ -28,7 +28,7 @@ public enum RuntimeDomain { public static final RuntimeDomain OSS_DOMAIN = RuntimeDomain.PUBLIC; public static final int OSS_MAJOR = 4; public static final int OSS_MINOR = 30; - public static final int OSS_PATCH = 0; + public static final int OSS_PATCH = 1; public static final String OSS_SUFFIX = "-dev"; public static final RuntimeDomain DOMAIN = OSS_DOMAIN; diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index 45a914ca82168..9c2ce19053afa 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.30.0 + 4.30.1 protobuf-kotlin diff --git a/java/pom.xml b/java/pom.xml index f9c53806bea49..2256dd88f54c0 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 4.30.0 + 4.30.1 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index 134a70ea4710b..9e5c0202ba0cf 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 4.30.0 + 4.30.1 pom Protobuf Compiler diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index cb065992610a4..3bee72a04bd33 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.30.0" +#define PHP_PROTOBUF_VERSION "4.30.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 088fe08e5e57a..6267795d6b05d 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl @@ -1,8 +1,8 @@ """ Contains version numbers to be used in other bzl files """ -PROTOC_VERSION = "30.0" -PROTOBUF_JAVA_VERSION = "4.30.0" -PROTOBUF_PYTHON_VERSION = "6.30.0" -PROTOBUF_PHP_VERSION = "4.30.0" -PROTOBUF_RUBY_VERSION = "4.30.0" -PROTOBUF_RUST_VERSION = "4.30.0" +PROTOC_VERSION = "30.1" +PROTOBUF_JAVA_VERSION = "4.30.1" +PROTOBUF_PYTHON_VERSION = "6.30.1" +PROTOBUF_PHP_VERSION = "4.30.1" +PROTOBUF_RUBY_VERSION = "4.30.1" +PROTOBUF_RUST_VERSION = "4.30.1" PROTOBUF_PREVIOUS_RELEASE = "28.0-rc1" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 34076f812a2fb..cf28114a785af 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__ = '6.30.0' +__version__ = '6.30.1' diff --git a/python/google/protobuf/runtime_version.py b/python/google/protobuf/runtime_version.py index 932b9db7aa6ac..f1797d4c7a7c5 100644 --- a/python/google/protobuf/runtime_version.py +++ b/python/google/protobuf/runtime_version.py @@ -29,7 +29,7 @@ class Domain(Enum): OSS_DOMAIN = Domain.PUBLIC OSS_MAJOR = 6 OSS_MINOR = 30 -OSS_PATCH = 0 +OSS_PATCH = 1 OSS_SUFFIX = '-dev' DOMAIN = OSS_DOMAIN diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 257b3a495db8a..c899bbd52bdd6 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.30.0" + s.version = "4.30.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 08686f3422fd7..d9cd3b9711cbc 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 4.30.0 + 4.30.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.30.0 + 4.30.1 org.jruby diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc index 3c60e2807c8e7..740385d2c1676 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 65fe14402e88c..551d3ce271add 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 82f2ce2a5fc45..90f43500f97c6 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 2f2c7df2d5dbe..7ff7b1fe9eb91 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 b84e68882ee41..3ea8a6fcc90b4 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 baadf0dd90034..d00883383d4ca 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 ee8dccd7dcfbb..e02332158ca30 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 e82680b1de0f7..498808188e9a0 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 79a9ee1a086bc..6b9ef15b3a852 100644 --- a/src/google/protobuf/compiler/versions.h +++ b/src/google/protobuf/compiler/versions.h @@ -53,10 +53,10 @@ // // Please avoid changing them manually, as they should be updated automatically // by Protobuf release process. -#define PROTOBUF_CPP_VERSION_STRING "6.30.0-dev" -#define PROTOBUF_JAVA_VERSION_STRING "4.30.0-dev" -#define PROTOBUF_PYTHON_VERSION_STRING "6.30.0-dev" -#define PROTOBUF_RUST_VERSION_STRING "4.30.0-dev" +#define PROTOBUF_CPP_VERSION_STRING "6.30.1-dev" +#define PROTOBUF_JAVA_VERSION_STRING "4.30.1-dev" +#define PROTOBUF_PYTHON_VERSION_STRING "6.30.1-dev" +#define PROTOBUF_RUST_VERSION_STRING "4.30.1-dev" namespace google { diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc index 7a4a65cfd1b41..181bbc75dd328 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 9c46e317710e4..97345352bfcfa 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 0ebcad3bf5753..8931143b5bec3 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 d4d71f85ab14d..d6e5817fd962f 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 232bd5ca50359..5c55b08962bf5 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 a7fa55c1fa2d0..9acd1661e755e 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 3a7647954a027..bab4696e4ea61 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 500c751bc2900..2a22558d6a969 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 14851579f5199..5c5012739e9c8 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 55e3a8e35f58d..47bc16dcf14e2 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 52273c9c6d6ce..4cfc299ba6b73 100644 --- a/src/google/protobuf/runtime_version.h +++ b/src/google/protobuf/runtime_version.h @@ -18,7 +18,7 @@ #endif // PROTOBUF_OSS_VERSION_SUFFIX // The OSS versions are not stripped to avoid merging conflicts. -#define PROTOBUF_OSS_VERSION 6030000 +#define PROTOBUF_OSS_VERSION 6030001 #define PROTOBUF_OSS_VERSION_SUFFIX "-dev" #define PROTOBUF_VERSION PROTOBUF_OSS_VERSION diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc index d1fbd13909262..935b45bdd23d8 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 1dfe5154e591c..0a4cbe802ec3b 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 9c1487b4b3034..9ac4ea40a7ee1 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 649123955cdb9..b9b8afa371f47 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 59c64cab31417..bbcf8da9a96a8 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -45,7 +45,7 @@ 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 6030000 +#define GOOGLE_PROTOBUF_VERSION 6030001 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX "-dev" diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc index 2013ceec783cf..1ef5b0c8d1eeb 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 e4135186a3696..7b84bc09afaee 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 5e4914cb5280d..dbc061262e9ac 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 f4af1e638f1ee..e6ef9378dc087 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 9e11627d990ee..302c0c205d3a2 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 82039eedcc068..e226f814b4076 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: 6.30.0-dev +// Protobuf C++ Version: 6.30.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 != 6030000 +#if PROTOBUF_VERSION != 6030001 #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 0dd8730f9f1fa..4516867848b47 100644 --- a/version.json +++ b/version.json @@ -1,18 +1,18 @@ { "30.x": { - "protoc_version": "30.0-dev", + "protoc_version": "30.1-dev", "lts": false, - "date": "2025-02-26", + "date": "2025-03-04", "languages": { - "cpp": "6.30.0-dev", - "csharp": "3.30.0-dev", - "java": "4.30.0-dev", - "javascript": "3.30.0-dev", - "objectivec": "4.30.0-dev", - "php": "4.30.0-dev", - "python": "6.30.0-dev", - "ruby": "4.30.0-dev", - "rust": "4.30.0-dev" + "cpp": "6.30.1-dev", + "csharp": "3.30.1-dev", + "java": "4.30.1-dev", + "javascript": "3.30.1-dev", + "objectivec": "4.30.1-dev", + "php": "4.30.1-dev", + "python": "6.30.1-dev", + "ruby": "4.30.1-dev", + "rust": "4.30.1-dev" } } } \ No newline at end of file