diff options
author | Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com> | 2022-09-29 12:01:45 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-29 12:01:45 -0700 |
commit | c9297981b7c35ad9c2bf258e7c8d786a04d13378 (patch) | |
tree | 5394d71d2c9338967f5debbe59d4c270061b0137 | |
parent | b0e8e607dc1ace17c823276d3384eeda775bbd76 (diff) | |
download | protobuf-c9297981b7c35ad9c2bf258e7c8d786a04d13378.tar.gz |
Updating version.json and repo version numbers to: 19.6 (#10677)
Co-authored-by: Protobuf Team Bot <protobuf-team-bot@google.com>
37 files changed, 67 insertions, 52 deletions
diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index c96026b37..4f47bc080 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '3.19.5' + s.version = '3.19.6' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = '3-Clause BSD License' diff --git a/Protobuf.podspec b/Protobuf.podspec index 1053b7b78..af2efdd54 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.19.5' + s.version = '3.19.6' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = '3-Clause BSD License' diff --git a/configure.ac b/configure.ac index 42036e14e..e89576ffc 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.59) # In the SVN trunk, the version should always be the next anticipated release # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[3.19.5],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.19.6],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index a6c9aefd4..e971302d3 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.19.5</version> + <version>3.19.6</version> <authors>Google Inc.</authors> <owners>protobuf-packages</owners> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl> diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index a3e07abd1..fc260491b 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -4,7 +4,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.19.5</VersionPrefix> + <VersionPrefix>3.19.6</VersionPrefix> <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence --> <LangVersion>7.2</LangVersion> <Authors>Google Inc.</Authors> diff --git a/java/README.md b/java/README.md index db827e5e1..6c68ffba0 100644 --- a/java/README.md +++ b/java/README.md @@ -23,7 +23,7 @@ If you are using Maven, use the following: <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.19.5</version> + <version>3.19.6</version> </dependency> ``` @@ -37,7 +37,7 @@ protobuf-java-util package: <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.19.5</version> + <version>3.19.6</version> </dependency> ``` @@ -45,7 +45,7 @@ protobuf-java-util package: If you are using Gradle, add the following to your `build.gradle` file's dependencies: ``` - implementation 'com.google.protobuf:protobuf-java:3.19.5' + implementation 'com.google.protobuf:protobuf-java:3.19.6' ``` 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 e3eda7757..4d42b271f 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>3.19.5</version> + <version>3.19.6</version> <packaging>pom</packaging> <name>Protocol Buffers [BOM]</name> diff --git a/java/core/pom.xml b/java/core/pom.xml index d322115f2..039fd4e87 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>3.19.5</version> + <version>3.19.6</version> </parent> <artifactId>protobuf-java</artifactId> diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index ae25ab328..e3a58ecc5 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>3.19.5</version> + <version>3.19.6</version> </parent> <artifactId>protobuf-kotlin-lite</artifactId> diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index 21ee2979b..81f1a6a5e 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>3.19.5</version> + <version>3.19.6</version> </parent> <artifactId>protobuf-kotlin</artifactId> diff --git a/java/lite.md b/java/lite.md index f515852d7..e48031494 100644 --- a/java/lite.md +++ b/java/lite.md @@ -30,7 +30,7 @@ protobuf Java runtime. If you are using Maven, use the following: <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-javalite</artifactId> - <version>3.19.5</version> + <version>3.19.6</version> </dependency> ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 9584ce40d..e4edb4d53 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>3.19.5</version> + <version>3.19.6</version> </parent> <artifactId>protobuf-javalite</artifactId> diff --git a/java/pom.xml b/java/pom.xml index d75dec742..7691276fc 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.19.5</version> + <version>3.19.6</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> diff --git a/java/util/pom.xml b/java/util/pom.xml index 6f4919674..6a98abf6b 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>3.19.5</version> + <version>3.19.6</version> </parent> <artifactId>protobuf-java-util</artifactId> diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index 50a9d9be2..4196c0eec 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -10,11 +10,11 @@ <email>protobufpackages@google.com</email> <active>yes</active> </lead> - <date>2022-09-14</date> - <time>13:34:21</time> + <date>2022-09-29</date> + <time>10:38:52</time> <version> - <release>3.19.5</release> - <api>3.19.5</api> + <release>3.19.6</release> + <api>3.19.6</api> </version> <stability> <release>stable</release> @@ -1218,5 +1218,20 @@ G A release. <notes> </notes> </release> + <release> + <version> + <release>3.19.6</release> + <api>3.19.6</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2022-09-29</date> + <time>10:38:52</time> + <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license> + <notes> + </notes> + </release> </changelog> </package> diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 20bf9ee18..974998887 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -91,7 +91,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.19.5" +#define PHP_PROTOBUF_VERSION "3.19.6" // 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 dafc44be9..90bdaa2ad 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl @@ -1 +1 @@ -PROTOBUF_VERSION = '3.19.5' +PROTOBUF_VERSION = '3.19.6' diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 558df12d5..672b41c46 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protoc</artifactId> - <version>3.19.5</version> + <version>3.19.6</version> <packaging>pom</packaging> <name>Protobuf Compiler</name> <description> diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 2875736f6..3c13cc9fd 100644 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,4 +30,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.19.5' +__version__ = '3.19.6' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 03da5b34c..699bebe63 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.19.5" + s.version = "3.19.6" 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 3d75eb46b..ccc0a8dad 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ <groupId>com.google.protobuf.jruby</groupId> <artifactId>protobuf-jruby</artifactId> - <version>3.19.5</version> + <version>3.19.6</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>3.19.5</version> + <version>3.19.6</version> </dependency> <dependency> <groupId>org.jruby</groupId> diff --git a/src/Makefile.am b/src/Makefile.am index 7c1747cf7..1d9cd6fb4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ else PTHREAD_DEF = endif -PROTOBUF_VERSION = 30:5:0 +PROTOBUF_VERSION = 30:6:0 if GCC # Turn on all warnings except for sign comparison (we ignore sign comparison diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index 04d002a22..630a99420 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 aa266570a..93a251eb7 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 10f33005e..95a996b9b 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 be1af1f10..5db9e812d 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 e37639551..7713e1f43 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 519feb6f5..46b0e10ce 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 487022cff..8b858cda8 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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/port_def.inc b/src/google/protobuf/port_def.inc index 2d1d77083..30af1cf56 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -153,7 +153,7 @@ #ifdef PROTOBUF_VERSION #error PROTOBUF_VERSION was previously defined #endif -#define PROTOBUF_VERSION 3019005 +#define PROTOBUF_VERSION 3019006 #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 4e2549bd7..00e17ace9 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 9578c4d72..ed53223d0 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 6a55620d3..1ba2c2888 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -82,7 +82,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 3019005 +#define GOOGLE_PROTOBUF_VERSION 3019006 // 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 e018b2f2b..bdf776387 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 099a62b51..b408bbfea 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 11dce3c4c..41cac507f 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3019005 < PROTOBUF_MIN_PROTOC_VERSION +#if 3019006 < 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 bac5e7951..7b9d8f33d 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "3.19.x": { - "protoc_version": "19.6-dev", + "protoc_version": "19.6", "lts": true, - "date": "2022-09-14", + "date": "2022-09-29", "languages": { - "cpp": "3.19.6-dev", - "csharp": "3.19.6-dev", - "java": "3.19.6-dev", - "javascript": "3.19.6-dev", - "objectivec": "3.19.6-dev", - "php": "3.19.6-dev", - "python": "3.19.6-dev", - "ruby": "3.19.6-dev" + "cpp": "3.19.6", + "csharp": "3.19.6", + "java": "3.19.6", + "javascript": "3.19.6", + "objectivec": "3.19.6", + "php": "3.19.6", + "python": "3.19.6", + "ruby": "3.19.6" } } }
\ No newline at end of file |