diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef3fade1ad925..7537c9ee373cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS)
endif ()
# Version metadata
-set(protobuf_VERSION_STRING "4.24.3")
+set(protobuf_VERSION_STRING "4.24.4")
set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "protobuf@googlegroups.com")
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
index 1e8513d8e50ef..508d56c904221 100644
--- a/Protobuf-C++.podspec
+++ b/Protobuf-C++.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
- s.version = '4.24.3'
+ s.version = '4.24.4'
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 ad017629671bf..ed93982449b37 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.24.3'
+ s.version = '3.24.4'
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 2f7380dd04b3c..8de67c73f6115 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.24.3
+ 3.24.4
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 9962f588d620b..633edcac805ed 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.24.3
+ 3.24.4
10.0
Google Inc.
netstandard1.1;netstandard2.0;net45;net50
diff --git a/java/README.md b/java/README.md
index d64b15989cdfb..8d2070ab5d91c 100644
--- a/java/README.md
+++ b/java/README.md
@@ -23,7 +23,7 @@ If you are using Maven, use the following:
com.google.protobuf
protobuf-java
- 3.24.3
+ 3.24.4
```
@@ -37,14 +37,14 @@ protobuf-java-util package:
com.google.protobuf
protobuf-java-util
- 3.24.3
+ 3.24.4
```
### Gradle
If you are using Gradle, add the following to your `build.gradle` file's
-dependencies: `implementation 'com.google.protobuf:protobuf-java:3.24.3'` Again,
+dependencies: `implementation 'com.google.protobuf:protobuf-java:3.24.4'` Again,
be sure to check that the version number matches (or is newer than) the version
number of protoc that you are using.
diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index e7b2bfa58e09e..748e257dd5b3c 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-bom
- 3.24.3
+ 3.24.4
pom
Protocol Buffers [BOM]
diff --git a/java/core/pom.xml b/java/core/pom.xml
index f7b7843f7bc8b..307174aaff3d6 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.24.3
+ 3.24.4
protobuf-java
diff --git a/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java b/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
index cbad3ca01f000..fe66e86ea2b08 100644
--- a/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
+++ b/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
@@ -2461,7 +2461,10 @@ public void clear(final GeneratedMessageV3.Builder> builder) {
final String containingOneofCamelCaseName) {
isOneofField =
descriptor.getRealContainingOneof() != null;
- hasHasMethod = descriptor.hasPresence();
+ hasHasMethod =
+ descriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO2
+ || descriptor.hasOptionalKeyword()
+ || (!isOneofField && descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE);
ReflectionInvoker reflectionInvoker =
new ReflectionInvoker(
descriptor,
diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
index 32f40a6a72da1..5ff83d9de7791 100644
--- a/java/kotlin-lite/pom.xml
+++ b/java/kotlin-lite/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.24.3
+ 3.24.4
protobuf-kotlin-lite
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index 332103a44ede6..528df3b90bd72 100644
--- a/java/kotlin/pom.xml
+++ b/java/kotlin/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.24.3
+ 3.24.4
protobuf-kotlin
diff --git a/java/lite.md b/java/lite.md
index f8bb31bf1f2ac..74c8e43469c95 100644
--- a/java/lite.md
+++ b/java/lite.md
@@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
com.google.protobuf
protobuf-javalite
- 3.24.3
+ 3.24.4
```
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index bdd4758c5aed3..609c1bd55cd34 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.24.3
+ 3.24.4
protobuf-javalite
diff --git a/java/pom.xml b/java/pom.xml
index dc09a58615d3f..7e19475a4620c 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.24.3
+ 3.24.4
pom
Protocol Buffers [Parent]
diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml
index 4636e67d369ac..ccb36529cc764 100644
--- a/java/protoc/pom.xml
+++ b/java/protoc/pom.xml
@@ -8,7 +8,7 @@
com.google.protobuf
protoc
- 3.24.3
+ 3.24.4
pom
Protobuf Compiler
diff --git a/java/util/pom.xml b/java/util/pom.xml
index 1024325e7cb1f..952ce8cfd7928 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -4,7 +4,7 @@
com.google.protobuf
protobuf-parent
- 3.24.3
+ 3.24.4
protobuf-java-util
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
index 2dab4065a7311..e880372e57233 100644
--- a/php/ext/google/protobuf/protobuf.h
+++ b/php/ext/google/protobuf/protobuf.h
@@ -127,7 +127,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()
-#define PHP_PROTOBUF_VERSION "3.24.3"
+#define PHP_PROTOBUF_VERSION "3.24.4"
// ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types:
diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl
index ee552c13e8c5a..2e883fd78fc55 100644
--- a/protobuf_deps.bzl
+++ b/protobuf_deps.bzl
@@ -149,7 +149,7 @@ def protobuf_deps():
_github_archive(
name = "upb",
repo = "https://github.com/protocolbuffers/upb",
- commit = "42cd08932e364a4cde35033b73f15c30250d7c2e",
- sha256 = "c67dd28e641e26c1c2ac295f1a693b864e8b074c683e7b9ef89f7aa8cf5db77a",
+ commit = "52a1ddadc25ac426ade7d21e84f00ad1192c21d0",
+ sha256 = "d3f451979243fc12b110d4d98cb9f4328ff11c71cfd06c82e0a0904c37d50379",
patches = ["@com_google_protobuf//build_defs:upb.patch"],
)
diff --git a/protobuf_version.bzl b/protobuf_version.bzl
index 4810ef1c7cce1..b28c8ad2b2595 100644
--- a/protobuf_version.bzl
+++ b/protobuf_version.bzl
@@ -1,6 +1,6 @@
""" Contains version numbers to be used in other bzl files """
-PROTOC_VERSION = "24.3"
-PROTOBUF_JAVA_VERSION = "3.24.3"
-PROTOBUF_PYTHON_VERSION = "4.24.3"
-PROTOBUF_PHP_VERSION = "3.24.3"
-PROTOBUF_RUBY_VERSION = "3.24.3"
+PROTOC_VERSION = "24.4"
+PROTOBUF_JAVA_VERSION = "3.24.4"
+PROTOBUF_PYTHON_VERSION = "4.24.4"
+PROTOBUF_PHP_VERSION = "3.24.4"
+PROTOBUF_RUBY_VERSION = "3.24.4"
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index e57673414cfe8..8f263e9788023 100755
--- a/python/google/protobuf/__init__.py
+++ b/python/google/protobuf/__init__.py
@@ -30,4 +30,4 @@
# Copyright 2007 Google Inc. All Rights Reserved.
-__version__ = '4.24.3'
+__version__ = '4.24.4'
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index 27d25ede4b816..1750a64e2e4b2 100644
--- a/ruby/google-protobuf.gemspec
+++ b/ruby/google-protobuf.gemspec
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "google-protobuf"
- s.version = "3.24.3"
+ s.version = "3.24.4"
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 a300fb6d8be13..d81e7c496acdc 100644
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@@ -9,7 +9,7 @@
com.google.protobuf.jruby
protobuf-jruby
- 3.24.3
+ 3.24.4
Protocol Buffer JRuby native extension
Protocol Buffers are a way of encoding structured data in an efficient yet
@@ -76,7 +76,7 @@
com.google.protobuf
protobuf-java-util
- 3.24.3
+ 3.24.4
org.jruby
diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel
index 9956816aab960..e7d24a9aef782 100644
--- a/src/google/protobuf/BUILD.bazel
+++ b/src/google/protobuf/BUILD.bazel
@@ -331,6 +331,7 @@ cc_library(
":arena_cleanup",
":string_block",
"//src/google/protobuf/stubs:lite",
+ "@com_google_absl//absl/container:layout",
"@com_google_absl//absl/log:absl_check",
"@com_google_absl//absl/log:absl_log",
"@com_google_absl//absl/synchronization",
diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
index e544b15762427..ce3b97f9c1e32 100644
--- a/src/google/protobuf/any.pb.h
+++ b/src/google/protobuf/any.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index fb02c3a666a30..506402ece68a7 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/arena.cc b/src/google/protobuf/arena.cc
index ce9d7882a9b48..f2e97eddae1ae 100644
--- a/src/google/protobuf/arena.cc
+++ b/src/google/protobuf/arena.cc
@@ -40,6 +40,7 @@
#include
#include "absl/base/attributes.h"
+#include "absl/container/internal/layout.h"
#include "absl/synchronization/mutex.h"
#include "google/protobuf/arena_allocation_policy.h"
#include "google/protobuf/arenaz_sampler.h"
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
index 2bbe9ba0984e9..429ebea1b9a33 100644
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/compiler/python/generator.cc b/src/google/protobuf/compiler/python/generator.cc
index ebfe4ce26d3e3..1ca2cb3972e4e 100644
--- a/src/google/protobuf/compiler/python/generator.cc
+++ b/src/google/protobuf/compiler/python/generator.cc
@@ -1194,10 +1194,18 @@ void PrintDescriptorOptionsFixingCode(absl::string_view descriptor,
io::Printer* printer) {
// Reset the _options to None thus DescriptorBase.GetOptions() can
// parse _options again after extensions are registered.
+ size_t dot_pos = descriptor.find('.');
+ std::string descriptor_name;
+ if (dot_pos == std::string::npos) {
+ descriptor_name = absl::StrCat("_globals['", descriptor, "']");
+ } else {
+ descriptor_name = absl::StrCat("_globals['", descriptor.substr(0, dot_pos),
+ "']", descriptor.substr(dot_pos));
+ }
printer->Print(
- "$descriptor$._options = None\n"
- "$descriptor$._serialized_options = $serialized_value$\n",
- "descriptor", descriptor, "serialized_value", options);
+ "$descriptor_name$._options = None\n"
+ "$descriptor_name$._serialized_options = $serialized_value$\n",
+ "descriptor_name", descriptor_name, "serialized_value", options);
}
} // namespace
diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h
index 74881a45f2117..fbb1669bfb0d3 100644
--- a/src/google/protobuf/cpp_features.pb.h
+++ b/src/google/protobuf/cpp_features.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index a774cf56690e9..c60247dcaf979 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index c0e7d7ad6db1b..d649012ebe56a 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
index 66175842a9606..4b4d35d15cc06 100644
--- a/src/google/protobuf/empty.pb.h
+++ b/src/google/protobuf/empty.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index 0b0e510a47b5f..e4e75309965f8 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/io/printer.h b/src/google/protobuf/io/printer.h
index 76a591121f688..a4bfa71e0e0ab 100644
--- a/src/google/protobuf/io/printer.h
+++ b/src/google/protobuf/io/printer.h
@@ -50,6 +50,7 @@
#include "absl/functional/function_ref.h"
#include "absl/log/absl_check.h"
#include "absl/meta/type_traits.h"
+#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index bb3323bbd101b..4759564b03ee2 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -255,7 +255,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined
#endif
-#define PROTOBUF_VERSION 4024003
+#define PROTOBUF_VERSION 4024004
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h
index 60accde80ed0d..9e2e6af06f946 100644
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index d4e94d33b067c..c477bccae22a5 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index 99e453ad84bf3..44d2ae33ffe01 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -66,7 +66,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 4024003
+#define GOOGLE_PROTOBUF_VERSION 4024004
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index 7c2afbeac9063..3d14c8c652aa7 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index b966585ecfbdb..bede7b0b4298f 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index fadf648c8abcc..a3fcc1624ad18 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
-#if 4024003 < PROTOBUF_MIN_PROTOC_VERSION
+#if 4024004 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."
diff --git a/version.json b/version.json
index 6a54ce9067287..fe7f72070ccc8 100644
--- a/version.json
+++ b/version.json
@@ -1,17 +1,17 @@
{
"24.x": {
- "protoc_version": "24.3",
+ "protoc_version": "24.4",
"lts": false,
- "date": "2023-09-06",
+ "date": "2023-10-03",
"languages": {
- "cpp": "4.24.3",
- "csharp": "3.24.3",
- "java": "3.24.3",
- "javascript": "3.24.3",
- "objectivec": "3.24.3",
- "php": "3.24.3",
- "python": "4.24.3",
- "ruby": "3.24.3"
+ "cpp": "4.24.4",
+ "csharp": "3.24.4",
+ "java": "3.24.4",
+ "javascript": "3.24.4",
+ "objectivec": "3.24.4",
+ "php": "3.24.4",
+ "python": "4.24.4",
+ "ruby": "3.24.4"
}
}
}
\ No newline at end of file