aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kruskal <62662355+mkruskal-google@users.noreply.github.com>2024-03-27 13:24:13 -0700
committerGitHub <noreply@github.com>2024-03-27 13:24:13 -0700
commit5f1e1d72fc27927a32fbbb7937f23f25e64f1e22 (patch)
treea01e404b73853c2547855f856f35f2bd5e1f21ae
parent49253b118b40719b938c2b74a53d70f5450d87b0 (diff)
parent1256a59e7d25e21cafc8da97e91fcd31e5b11299 (diff)
downloadprotobuf-upstream-26.x.tar.gz
Merge pull request #16332 from protocolbuffers/26.x-202403271956upstream-26.x
Merge release commits to 26.x
-rw-r--r--CMakeLists.txt2
-rw-r--r--Protobuf-C++.podspec2
-rw-r--r--Protobuf.podspec2
-rw-r--r--csharp/Google.Protobuf.Tools.nuspec2
-rw-r--r--csharp/src/Google.Protobuf/Google.Protobuf.csproj2
-rw-r--r--java/bom/pom.xml2
-rw-r--r--java/core/pom.xml2
-rw-r--r--java/core/src/main/java/com/google/protobuf/RuntimeVersion.java2
-rw-r--r--java/kotlin-lite/pom.xml2
-rw-r--r--java/kotlin/pom.xml2
-rw-r--r--java/lite/pom.xml2
-rw-r--r--java/pom.xml2
-rw-r--r--java/protoc/pom.xml2
-rw-r--r--java/util/pom.xml2
-rw-r--r--php/ext/google/protobuf/protobuf.h2
-rw-r--r--protobuf_version.bzl10
-rwxr-xr-xpython/google/protobuf/__init__.py2
-rw-r--r--ruby/google-protobuf.gemspec2
-rw-r--r--ruby/pom.xml4
-rw-r--r--src/google/protobuf/any.pb.cc2
-rw-r--r--src/google/protobuf/any.pb.h4
-rw-r--r--src/google/protobuf/api.pb.cc2
-rw-r--r--src/google/protobuf/api.pb.h4
-rw-r--r--src/google/protobuf/compiler/java/java_features.pb.cc2
-rw-r--r--src/google/protobuf/compiler/java/java_features.pb.h4
-rw-r--r--src/google/protobuf/compiler/plugin.pb.cc2
-rw-r--r--src/google/protobuf/compiler/plugin.pb.h4
-rw-r--r--src/google/protobuf/compiler/versions.h6
-rw-r--r--src/google/protobuf/cpp_features.pb.cc2
-rw-r--r--src/google/protobuf/cpp_features.pb.h4
-rw-r--r--src/google/protobuf/descriptor.pb.cc2
-rw-r--r--src/google/protobuf/descriptor.pb.h4
-rw-r--r--src/google/protobuf/duration.pb.cc2
-rw-r--r--src/google/protobuf/duration.pb.h4
-rw-r--r--src/google/protobuf/empty.pb.cc2
-rw-r--r--src/google/protobuf/empty.pb.h4
-rw-r--r--src/google/protobuf/field_mask.pb.cc2
-rw-r--r--src/google/protobuf/field_mask.pb.h4
-rw-r--r--src/google/protobuf/port_def.inc2
-rw-r--r--src/google/protobuf/source_context.pb.cc2
-rw-r--r--src/google/protobuf/source_context.pb.h4
-rw-r--r--src/google/protobuf/struct.pb.cc2
-rw-r--r--src/google/protobuf/struct.pb.h4
-rw-r--r--src/google/protobuf/stubs/common.h2
-rw-r--r--src/google/protobuf/timestamp.pb.cc2
-rw-r--r--src/google/protobuf/timestamp.pb.h4
-rw-r--r--src/google/protobuf/type.pb.cc2
-rw-r--r--src/google/protobuf/type.pb.h4
-rw-r--r--src/google/protobuf/wrappers.pb.cc2
-rw-r--r--src/google/protobuf/wrappers.pb.h4
-rw-r--r--version.json20
51 files changed, 81 insertions, 81 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 312eeb928..db7c620ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS)
endif ()
# Version metadata
-set(protobuf_VERSION_STRING "5.26.1")
+set(protobuf_VERSION_STRING "5.26.2")
set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "protobuf@googlegroups.com")
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
index 73fc917cd..ff7dade79 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.26.1'
+ s.version = '5.26.2'
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 817a188a5..a453b0819 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.26.1'
+ s.version = '3.26.2'
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 fd78795c2..41e75c738 100644
--- a/csharp/Google.Protobuf.Tools.nuspec
+++ b/csharp/Google.Protobuf.Tools.nuspec
@@ -5,7 +5,7 @@
<title>Google Protocol Buffers tools</title>
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
<description>See project site for more info.</description>
- <version>3.26.1</version>
+ <version>3.26.2</version>
<authors>Google Inc.</authors>
<owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>
diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
index a62ae1f9d..9e7611737 100644
--- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj
+++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@@ -5,7 +5,7 @@
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
<Copyright>Copyright 2015, Google Inc.</Copyright>
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
- <VersionPrefix>3.26.1</VersionPrefix>
+ <VersionPrefix>3.26.2</VersionPrefix>
<LangVersion>10.0</LangVersion>
<Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>
diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index 13ae4bb95..7155ec9f3 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
<packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name>
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 2d3977cbd..dd98c8600 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
</parent>
<artifactId>protobuf-java</artifactId>
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 e41ae17d2..4cd20ea9b 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 final class RuntimeVersion {
public static final RuntimeDomain DOMAIN = RuntimeDomain.PUBLIC;
public static final int MAJOR = 4;
public static final int MINOR = 26;
- public static final int PATCH = 1;
+ public static final int PATCH = 2;
public static final String SUFFIX = "-dev";
private static final String VERSION_STRING = versionString(MAJOR, MINOR, PATCH, SUFFIX);
diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
index e60a51f92..3d6cb4a89 100644
--- a/java/kotlin-lite/pom.xml
+++ b/java/kotlin-lite/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
</parent>
<artifactId>protobuf-kotlin-lite</artifactId>
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index 96c96f4c6..3ca5255f3 100644
--- a/java/kotlin/pom.xml
+++ b/java/kotlin/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
</parent>
<artifactId>protobuf-kotlin</artifactId>
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index a2e5c49cb..53c316284 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
</parent>
<artifactId>protobuf-javalite</artifactId>
diff --git a/java/pom.xml b/java/pom.xml
index 65d9c4bb1..2c5393041 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
<packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name>
diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml
index 50c1bd1e9..528f8898f 100644
--- a/java/protoc/pom.xml
+++ b/java/protoc/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>
diff --git a/java/util/pom.xml b/java/util/pom.xml
index dfef54a1d..827673f0d 100644
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
</parent>
<artifactId>protobuf-java-util</artifactId>
diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
index 739b6681e..a5aca5514 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.26.1"
+#define PHP_PROTOBUF_VERSION "4.26.2"
// 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 fb66f2ad8..c0717379f 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 = "26.1"
-PROTOBUF_JAVA_VERSION = "4.26.1"
-PROTOBUF_PYTHON_VERSION = "5.26.1"
-PROTOBUF_PHP_VERSION = "4.26.1"
-PROTOBUF_RUBY_VERSION = "4.26.1"
+PROTOC_VERSION = "26.2"
+PROTOBUF_JAVA_VERSION = "4.26.2"
+PROTOBUF_PYTHON_VERSION = "5.26.2"
+PROTOBUF_PHP_VERSION = "4.26.2"
+PROTOBUF_RUBY_VERSION = "4.26.2"
diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py
index 7eafebd83..50b360dc4 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.26.1'
+__version__ = '5.26.2'
diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec
index db0cce001..241b1a073 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.26.1"
+ s.version = "4.26.2"
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 f58c3860b..d0e5fbef3 100644
--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
<name>Protocol Buffer JRuby native extension</name>
<description>
Protocol Buffers are a way of encoding structured data in an efficient yet
@@ -76,7 +76,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
- <version>4.26.1</version>
+ <version>4.26.2</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
index 9d0eeadad..4534f811c 100644
--- a/src/google/protobuf/any.pb.cc
+++ b/src/google/protobuf/any.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/any.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#include "google/protobuf/any.pb.h"
diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
index 1f8aa788d..7c571761a 100644
--- a/src/google/protobuf/any.pb.h
+++ b/src/google/protobuf/any.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/any.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 1d18c5de0..c785fee9d 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/api.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#include "google/protobuf/api.pb.h"
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index da9120309..5428b73b5 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/api.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 93d5e23d0..b7d37932e 100644
--- a/src/google/protobuf/compiler/java/java_features.pb.cc
+++ b/src/google/protobuf/compiler/java/java_features.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/compiler/java/java_features.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-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 daf33a80e..c6c0e97a8 100644
--- a/src/google/protobuf/compiler/java/java_features.pb.h
+++ b/src/google/protobuf/compiler/java/java_features.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/compiler/java/java_features.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 8e1477b5e..cb3a1b0b7 100644
--- a/src/google/protobuf/compiler/plugin.pb.cc
+++ b/src/google/protobuf/compiler/plugin.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/compiler/plugin.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-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 dc49539af..cdab8fa93 100644
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/compiler/plugin.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 6398b9acc..df8b0b6b1 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.26.1-dev"
-#define PROTOBUF_JAVA_VERSION_STRING "4.26.1-dev"
-#define PROTOBUF_PYTHON_VERSION_STRING "5.26.1-dev"
+#define PROTOBUF_CPP_VERSION_STRING "5.26.2-dev"
+#define PROTOBUF_JAVA_VERSION_STRING "4.26.2-dev"
+#define PROTOBUF_PYTHON_VERSION_STRING "5.26.2-dev"
namespace google {
diff --git a/src/google/protobuf/cpp_features.pb.cc b/src/google/protobuf/cpp_features.pb.cc
index 135cc8ba0..5c233cd17 100644
--- a/src/google/protobuf/cpp_features.pb.cc
+++ b/src/google/protobuf/cpp_features.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/cpp_features.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-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 347ba4d24..1300e3b34 100644
--- a/src/google/protobuf/cpp_features.pb.h
+++ b/src/google/protobuf/cpp_features.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/cpp_features.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 b5de9f0af..0684d7910 100644
--- a/src/google/protobuf/descriptor.pb.cc
+++ b/src/google/protobuf/descriptor.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/descriptor.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#include "google/protobuf/descriptor.pb.h"
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index 8c00f3ca8..fd175df40 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/descriptor.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 fb4de236b..cac1eb9b8 100644
--- a/src/google/protobuf/duration.pb.cc
+++ b/src/google/protobuf/duration.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/duration.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#include "google/protobuf/duration.pb.h"
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index 57b539b39..ae37feae2 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/duration.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 aa00e5793..5a4a5b606 100644
--- a/src/google/protobuf/empty.pb.cc
+++ b/src/google/protobuf/empty.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/empty.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#include "google/protobuf/empty.pb.h"
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
index d02fb4828..6aa2efde0 100644
--- a/src/google/protobuf/empty.pb.h
+++ b/src/google/protobuf/empty.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/empty.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 4f040b63c..1b079ed32 100644
--- a/src/google/protobuf/field_mask.pb.cc
+++ b/src/google/protobuf/field_mask.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/field_mask.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-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 62f56f2ec..a69c3ea94 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/field_mask.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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/port_def.inc b/src/google/protobuf/port_def.inc
index ae5992ce3..a95a8e649 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -170,7 +170,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined
#endif
-#define PROTOBUF_VERSION 5026001
+#define PROTOBUF_VERSION 5026002
#ifdef PROTOBUF_VERSION_SUFFIX
#error PROTOBUF_VERSION_SUFFIX was previously defined
diff --git a/src/google/protobuf/source_context.pb.cc b/src/google/protobuf/source_context.pb.cc
index e4c2a5a1c..d0fe7f717 100644
--- a/src/google/protobuf/source_context.pb.cc
+++ b/src/google/protobuf/source_context.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/source_context.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-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 43bc1dff3..dc0c8c51f 100644
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/source_context.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 55c234232..6b8708d6e 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/struct.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#include "google/protobuf/struct.pb.h"
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 9135892b7..eb1665767 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/struct.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 0ab7e0656..8ca3f99d1 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 5026001
+#define GOOGLE_PROTOBUF_VERSION 5026002
// 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 ab3c232af..be6a26779 100644
--- a/src/google/protobuf/timestamp.pb.cc
+++ b/src/google/protobuf/timestamp.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/timestamp.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#include "google/protobuf/timestamp.pb.h"
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index b9bec64a1..0b602de79 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/timestamp.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 95ffbb336..9fc07bdfc 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/type.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#include "google/protobuf/type.pb.h"
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 5ae38e464..0296466c1 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/type.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 c9f89cf40..0a1623bfa 100644
--- a/src/google/protobuf/wrappers.pb.cc
+++ b/src/google/protobuf/wrappers.pb.cc
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/wrappers.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#include "google/protobuf/wrappers.pb.h"
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index ed9b4e48a..33b62b300 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -1,6 +1,6 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/wrappers.proto
-// Protobuf C++ Version: 5.26.1-dev
+// Protobuf C++ Version: 5.26.2-dev
#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
@@ -11,7 +11,7 @@
#include <utility>
#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION != 5026001
+#if PROTOBUF_VERSION != 5026002
#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 0e9a757fb..662c43cc3 100644
--- a/version.json
+++ b/version.json
@@ -1,17 +1,17 @@
{
"26.x": {
- "protoc_version": "26.1-dev",
+ "protoc_version": "26.2-dev",
"lts": false,
- "date": "2024-03-12",
+ "date": "2024-03-27",
"languages": {
- "cpp": "5.26.1-dev",
- "csharp": "3.26.1-dev",
- "java": "4.26.1-dev",
- "javascript": "3.26.1-dev",
- "objectivec": "3.26.1-dev",
- "php": "4.26.1-dev",
- "python": "5.26.1-dev",
- "ruby": "4.26.1-dev"
+ "cpp": "5.26.2-dev",
+ "csharp": "3.26.2-dev",
+ "java": "4.26.2-dev",
+ "javascript": "3.26.2-dev",
+ "objectivec": "3.26.2-dev",
+ "php": "4.26.2-dev",
+ "python": "5.26.2-dev",
+ "ruby": "4.26.2-dev"
}
}
} \ No newline at end of file