AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch '3.20.x' into 3.20.x-202204011233

Browse Source
This commit is contained in:
Mike Kruskal 2022-04-01 12:34:01 -07:00
commit ffe4b0cfe6
29 changed files with 85 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES.txt
View File

@ -17,8 +17,11 @@ Python
Ruby
* Dropped Ruby 2.3 and 2.4 support for CI and releases. (#9311)
* Message.decode/encode: Add max_recursion_depth option (#9218)
* Rename max_recursion_depth to recursion_limit (#9486)
* Added Ruby 3.1 support for CI and releases (#9566).
* Message.decode/encode: Add recursion_limit option (#9218/#9486)
* Allocate with xrealloc()/xfree() so message allocation is visible to the
Ruby GC. In certain tests this leads to much lower memory usage due to more
frequent GC runs (#9586).
* Fix conversion of singleton classes in Ruby (#9342)
* Suppress warning for intentional circular require (#9556)
* JSON will now output shorter strings for double and float fields when possible

2
Protobuf-C++.podspec
View File

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

2
Protobuf.podspec
View File

@ -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.20.0-rc1'
s.version = '3.20.0'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = 'BSD-3-Clause'

2
configure.ac
View File

@ -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.20.0-rc-1],[protobuf@googlegroups.com],[protobuf])
AC_INIT([Protocol Buffers],[3.20.0],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable])

2
csharp/Google.Protobuf.Tools.nuspec
View File

@ -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.20.0-rc1</version>
<version>3.20.0</version>
<authors>Google Inc.</authors>
<owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>

2
csharp/src/Google.Protobuf/Google.Protobuf.csproj
View File

@ -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.20.0-rc1</VersionPrefix>
<VersionPrefix>3.20.0</VersionPrefix>
<!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
<LangVersion>7.2</LangVersion>
<Authors>Google Inc.</Authors>

6
java/README.md
View File

@ -23,7 +23,7 @@ If you are using Maven, use the following:
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.20.0-rc-1</version>
<version>3.20.0</version>
</dependency>
```
@ -37,7 +37,7 @@ protobuf-java-util package:
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>3.20.0-rc-1</version>
<version>3.20.0</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.20.0-rc-1'
implementation 'com.google.protobuf:protobuf-java:3.20.0'
```
Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.

2
java/bom/pom.xml
View File

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

2
java/core/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.20.0-rc-1</version>
<version>3.20.0</version>
</parent>
<artifactId>protobuf-java</artifactId>

2
java/kotlin-lite/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.20.0-rc-1</version>
<version>3.20.0</version>
</parent>
<artifactId>protobuf-kotlin-lite</artifactId>

2
java/kotlin/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.20.0-rc-1</version>
<version>3.20.0</version>
</parent>
<artifactId>protobuf-kotlin</artifactId>

2
java/lite.md
View File

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

2
java/lite/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.20.0-rc-1</version>
<version>3.20.0</version>
</parent>
<artifactId>protobuf-javalite</artifactId>

2
java/pom.xml
View File

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

2
java/util/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.20.0-rc-1</version>
<version>3.20.0</version>
</parent>
<artifactId>protobuf-java-util</artifactId>

2
js/package.json
View File

@ -1,6 +1,6 @@
{
"name": "google-protobuf",
"version": "3.20.0-rc.1",
"version": "3.20.0",
"description": "Protocol Buffers for JavaScript",
"main": "google-protobuf.js",
"files": [

48
php/ext/google/protobuf/package.xml
View File

@ -10,15 +10,15 @@
<email>protobuf-opensource@google.com</email>
<active>yes</active>
</lead>
<date>2022-03-04</date>
<time>16:28:14</time>
<date>2022-03-25</date>
<time>19:17:44</time>
<version>
<release>3.20.0RC1</release>
<release>3.20.0</release>
<api>3.20.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</license>
<notes>
@ -46,10 +46,12 @@
<file baseinstalldir="/" name="protobuf.c" role="src"/>
<file baseinstalldir="/" name="protobuf.h" role="src"/>
<file baseinstalldir="/" name="wkt.inc" role="src"/>
<file baseinstalldir="/" name="third_party/utf8_range/naive.c" role="doc"/>
<file baseinstalldir="/" name="third_party/utf8_range/range2-neon.c" role="doc"/>
<file baseinstalldir="/" name="third_party/utf8_range/range2-sse.c" role="doc"/>
<file baseinstalldir="/" name="LICENSE" role="doc"/>
<file baseinstalldir="/" name="third_party/utf8_range/naive.c" role="src"/>
<file baseinstalldir="/" name="third_party/utf8_range/range2-neon.c" role="src"/>
<file baseinstalldir="/" name="third_party/utf8_range/range2-sse.c" role="src"/>
<file baseinstalldir="/" name="third_party/utf8_range/utf8_range.h" role="src"/>
<file baseinstalldir="/" name="third_party/utf8_range/LICENSE" role="doc"/>
</dir>
</contents>
<dependencies>
@ -1221,5 +1223,35 @@ G A release.
<notes>
</notes>
</release>
<release>
<version>
<release>3.20.0RC2</release>
<api>3.20.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<date>2022-03-15</date>
<time>21:10:15</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</license>
<notes>
</notes>
</release>
<release>
<version>
<release>3.20.0</release>
<api>3.20.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2022-03-25</date>
<time>19:17:44</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</license>
<notes>
</notes>
</release>
</changelog>
</package>

2
php/ext/google/protobuf/protobuf.h
View File

@ -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.20.0RC1"
#define PHP_PROTOBUF_VERSION "3.20.0"
// ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types:

6
php/release.sh
View File

@ -30,7 +30,11 @@ mv ../protobuf/composer.json composer.json
sed -i 's|php/src|src|g' composer.json
git add .
git commit -m "$VERSION"
git tag "$VERSION"
if [ $(git tag -l "$VERSION") ]; then
echo "tag $VERSION already exists"
else
git tag "$VERSION"
fi
popd
# Clean up

10
protobuf.bzl
View File

@ -266,9 +266,9 @@ def cc_proto_library(
deps = [],
cc_libs = [],
include = None,
protoc = Label("//:protoc"),
protoc = "@com_google_protobuf//:protoc",
use_grpc_plugin = False,
default_runtime = Label("//:protobuf"),
default_runtime = "@com_google_protobuf//:protobuf",
**kargs):
"""Bazel rule to create a C++ protobuf library from proto source files
@ -386,7 +386,7 @@ internal_gen_well_known_protos_java = rule(
"_protoc": attr.label(
executable = True,
cfg = "exec",
default = "//:protoc",
default = "@com_google_protobuf//:protoc",
),
},
)
@ -493,8 +493,8 @@ def py_proto_library(
py_libs = [],
py_extra_srcs = [],
include = None,
default_runtime = Label("//:protobuf_python"),
protoc = Label("//:protoc"),
default_runtime = "@com_google_protobuf//:protobuf_python",
protoc = "@com_google_protobuf//:protoc",
use_grpc_plugin = False,
**kargs):
"""Bazel rule to create a Python protobuf library from proto source files

2
protobuf_deps.bzl
View File

@ -30,7 +30,7 @@ def protobuf_deps():
if not native.existing_rule("zlib"):
http_archive(
name = "zlib",
build_file = Label("//:third_party/zlib.BUILD"),
build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
sha256 = "629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff",
strip_prefix = "zlib-1.2.11",
urls = ["https://github.com/madler/zlib/archive/v1.2.11.tar.gz"],

2
protobuf_version.bzl
View File

@ -1 +1 @@
PROTOBUF_VERSION = '3.20.0-rc-1'
PROTOBUF_VERSION = '3.20.0'

2
protoc-artifacts/pom.xml
View File

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

2
python/google/protobuf/__init__.py
View File

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

2
ruby/google-protobuf.gemspec
View File

@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "google-protobuf"
s.version = "3.20.0.rc.1"
s.version = "3.20.0"
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"

4
ruby/pom.xml
View File

@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId>
<version>3.20.0-rc-1</version>
<version>3.20.0</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.20.0-rc-1</version>
<version>3.20.0</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>

2
src/google/protobuf/port_def.inc
View File

@ -172,7 +172,7 @@
#ifdef PROTOBUF_VERSION_SUFFIX
#error PROTOBUF_VERSION_SUFFIX was previously defined
#endif
#define PROTOBUF_VERSION_SUFFIX "-rc1"
#define PROTOBUF_VERSION_SUFFIX ""
#if defined(PROTOBUF_NAMESPACE) || defined(PROTOBUF_NAMESPACE_ID)
#error PROTOBUF_NAMESPACE or PROTOBUF_NAMESPACE_ID was previously defined

2
src/google/protobuf/stubs/common.h
View File

@ -85,7 +85,7 @@ namespace internal {
#define GOOGLE_PROTOBUF_VERSION 3020000
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1"
#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
// The minimum header version which works with the current version of
// the library. This constant should only be used by protoc's C++ code

6
update_version.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
# Usage: ./update_version.py <MAJOR>.<MINOR>.<MICRO> [<RC version>]
#
# Example:
@ -201,7 +201,7 @@ def UpdateCpp():
'#if %s < PROTOBUF_MIN_PROTOC_VERSION' % cpp_version,
line)
return line
RewriteTextFile('src/google/protobuf/stubs/common.h', RewriteCommon)
RewriteTextFile('src/google/protobuf/port_def.inc', RewritePortDef)
RewriteTextFile('src/google/protobuf/any.pb.h', RewritePbH)
@ -268,7 +268,7 @@ def UpdateJava():
RewriteXml('protoc-artifacts/pom.xml',
lambda document : ReplaceText(
Find(document.documentElement, 'version'), GetFullVersion()))
RewriteTextFile('java/README.md',
lambda line : re.sub(
r'<version>.*</version>',