Merge pull request #13058 from protocolbuffers/23.x-202306140951

23.x 202306140951
pull/13088/head
Mike Kruskal 2 years ago committed by GitHub
commit 689f9c10e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CMakeLists.txt
  2. 2
      Protobuf-C++.podspec
  3. 2
      Protobuf.podspec
  4. 2
      csharp/Google.Protobuf.Tools.nuspec
  5. 2
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  6. 6
      java/README.md
  7. 2
      java/bom/pom.xml
  8. 2
      java/core/pom.xml
  9. 2
      java/kotlin-lite/pom.xml
  10. 2
      java/kotlin/pom.xml
  11. 2
      java/lite.md
  12. 2
      java/lite/pom.xml
  13. 2
      java/pom.xml
  14. 2
      java/protoc/pom.xml
  15. 2
      java/util/pom.xml
  16. 2
      php/ext/google/protobuf/protobuf.h
  17. 10
      protobuf_version.bzl
  18. 2
      python/google/protobuf/__init__.py
  19. 2
      ruby/google-protobuf.gemspec
  20. 4
      ruby/pom.xml
  21. 2
      src/google/protobuf/any.pb.h
  22. 2
      src/google/protobuf/api.pb.h
  23. 2
      src/google/protobuf/compiler/plugin.pb.h
  24. 2
      src/google/protobuf/descriptor.pb.h
  25. 2
      src/google/protobuf/duration.pb.h
  26. 2
      src/google/protobuf/empty.pb.h
  27. 2
      src/google/protobuf/field_mask.pb.h
  28. 2
      src/google/protobuf/port_def.inc
  29. 2
      src/google/protobuf/source_context.pb.h
  30. 2
      src/google/protobuf/struct.pb.h
  31. 2
      src/google/protobuf/stubs/common.h
  32. 2
      src/google/protobuf/timestamp.pb.h
  33. 2
      src/google/protobuf/type.pb.h
  34. 2
      src/google/protobuf/wrappers.pb.h
  35. 20
      version.json

@ -93,7 +93,7 @@ if (protobuf_BUILD_SHARED_LIBS)
endif () endif ()
# Version metadata # Version metadata
set(protobuf_VERSION_STRING "4.23.2") set(protobuf_VERSION_STRING "4.23.3")
set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "protobuf@googlegroups.com") set(protobuf_CONTACT "protobuf@googlegroups.com")

@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Protobuf-C++' s.name = 'Protobuf-C++'
s.version = '4.23.2' s.version = '4.23.3'
s.summary = 'Protocol Buffers v3 runtime library for C++.' s.summary = 'Protocol Buffers v3 runtime library for C++.'
s.homepage = 'https://github.com/google/protobuf' s.homepage = 'https://github.com/google/protobuf'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'

@ -5,7 +5,7 @@
# dependent projects use the :git notation to refer to the library. # dependent projects use the :git notation to refer to the library.
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Protobuf' s.name = 'Protobuf'
s.version = '3.23.2' s.version = '3.23.3'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf' s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'

@ -5,7 +5,7 @@
<title>Google Protocol Buffers tools</title> <title>Google Protocol Buffers tools</title>
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
<description>See project site for more info.</description> <description>See project site for more info.</description>
<version>3.23.2</version> <version>3.23.3</version>
<authors>Google Inc.</authors> <authors>Google Inc.</authors>
<owners>protobuf-packages</owners> <owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

@ -5,7 +5,7 @@
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description> <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
<Copyright>Copyright 2015, Google Inc.</Copyright> <Copyright>Copyright 2015, Google Inc.</Copyright>
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle> <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
<VersionPrefix>3.23.2</VersionPrefix> <VersionPrefix>3.23.3</VersionPrefix>
<LangVersion>10.0</LangVersion> <LangVersion>10.0</LangVersion>
<Authors>Google Inc.</Authors> <Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks> <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

@ -23,7 +23,7 @@ If you are using Maven, use the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
</dependency> </dependency>
``` ```
@ -37,14 +37,14 @@ protobuf-java-util package:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
</dependency> </dependency>
``` ```
### Gradle ### Gradle
If you are using Gradle, add the following to your `build.gradle` file's If you are using Gradle, add the following to your `build.gradle` file's
dependencies: `implementation 'com.google.protobuf:protobuf-java:3.23.2'` Again, dependencies: `implementation 'com.google.protobuf:protobuf-java:3.23.3'` Again,
be sure to check that the version number matches (or is newer than) the version be sure to check that the version number matches (or is newer than) the version
number of protoc that you are using. number of protoc that you are using.

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId> <artifactId>protobuf-bom</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name> <name>Protocol Buffers [BOM]</name>

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
</parent> </parent>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
</parent> </parent>
<artifactId>protobuf-kotlin-lite</artifactId> <artifactId>protobuf-kotlin-lite</artifactId>

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
</parent> </parent>
<artifactId>protobuf-kotlin</artifactId> <artifactId>protobuf-kotlin</artifactId>

@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
</dependency> </dependency>
``` ```

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
</parent> </parent>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name> <name>Protocol Buffers [Parent]</name>

@ -8,7 +8,7 @@
</parent> </parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId> <artifactId>protoc</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protobuf Compiler</name> <name>Protobuf Compiler</name>
<description> <description>

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
</parent> </parent>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>

@ -127,7 +127,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
#define PHP_PROTOBUF_VERSION "3.23.2" #define PHP_PROTOBUF_VERSION "3.23.3"
// ptr -> PHP object cache. This is a weak map that caches lazily-created // ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types: // wrapper objects around upb types:

@ -1,6 +1,6 @@
""" Contains version numbers to be used in other bzl files """ """ Contains version numbers to be used in other bzl files """
PROTOC_VERSION = "23.2" PROTOC_VERSION = "23.3"
PROTOBUF_JAVA_VERSION = "3.23.2" PROTOBUF_JAVA_VERSION = "3.23.3"
PROTOBUF_PYTHON_VERSION = "4.23.2" PROTOBUF_PYTHON_VERSION = "4.23.3"
PROTOBUF_PHP_VERSION = "3.23.2" PROTOBUF_PHP_VERSION = "3.23.3"
PROTOBUF_RUBY_VERSION = "3.23.2" PROTOBUF_RUBY_VERSION = "3.23.3"

@ -30,4 +30,4 @@
# Copyright 2007 Google Inc. All Rights Reserved. # Copyright 2007 Google Inc. All Rights Reserved.
__version__ = '4.23.2' __version__ = '4.23.3'

@ -1,6 +1,6 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "google-protobuf" s.name = "google-protobuf"
s.version = "3.23.2" s.version = "3.23.3"
git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag 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.licenses = ["BSD-3-Clause"]
s.summary = "Protocol Buffers" s.summary = "Protocol Buffers"

@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId> <groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId> <artifactId>protobuf-jruby</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
<name>Protocol Buffer JRuby native extension</name> <name>Protocol Buffer JRuby native extension</name>
<description> <description>
Protocol Buffers are a way of encoding structured data in an efficient yet Protocol Buffers are a way of encoding structured data in an efficient yet
@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
<version>3.23.2</version> <version>3.23.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jruby</groupId> <groupId>org.jruby</groupId>

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -246,7 +246,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#ifdef PROTOBUF_VERSION #ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined #error PROTOBUF_VERSION was previously defined
#endif #endif
#define PROTOBUF_VERSION 4023002 #define PROTOBUF_VERSION 4023003
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -66,7 +66,7 @@ namespace internal {
// The current version, represented as a single integer to make comparison // The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro // easier: major * 10^6 + minor * 10^3 + micro
#define GOOGLE_PROTOBUF_VERSION 4023002 #define GOOGLE_PROTOBUF_VERSION 4023003
// A suffix string for alpha, beta or rc releases. Empty for stable releases. // A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" #define GOOGLE_PROTOBUF_VERSION_SUFFIX ""

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers." #error "your headers."
#endif // PROTOBUF_VERSION #endif // PROTOBUF_VERSION
#if 4023002 < PROTOBUF_MIN_PROTOC_VERSION #if 4023003 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is" #error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please" #error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc." #error "regenerate this file with a newer version of protoc."

@ -1,17 +1,17 @@
{ {
"23.x": { "23.x": {
"protoc_version": "23.3-dev", "protoc_version": "23.4-dev",
"lts": false, "lts": false,
"date": "2023-05-25", "date": "2023-06-14",
"languages": { "languages": {
"cpp": "4.23.3-dev", "cpp": "4.23.4-dev",
"csharp": "3.23.3-dev", "csharp": "3.23.4-dev",
"java": "3.23.3-dev", "java": "3.23.4-dev",
"javascript": "3.23.3-dev", "javascript": "3.23.4-dev",
"objectivec": "3.23.3-dev", "objectivec": "3.23.4-dev",
"php": "3.23.3-dev", "php": "3.23.4-dev",
"python": "4.23.3-dev", "python": "4.23.4-dev",
"ruby": "3.23.3-dev" "ruby": "3.23.4-dev"
} }
} }
} }
Loading…
Cancel
Save