Skip to content

Commit b17bb39

Browse files
deannagarciadeannagarcia
authored
Merge pull request #10548 from protocolbuffers/3.16.x-202209131829
Merge version updates
2 parents a7d4e94 + c18f5e7 commit b17bb39

34 files changed

+69
-49
lines changed

Diff for: ‎CHANGES.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2022-09-13 version 16.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
2+
3+
C++
4+
* Reduce memory consumption of MessageSet parsing
5+
16
2022-01-05 version 3.16.1 (Java)
27

38
Java

Diff for: ‎Protobuf-C++.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Protobuf-C++'
3-
s.version = '3.16.1'
3+
s.version = '3.16.2'
44
s.summary = 'Protocol Buffers v3 runtime library for C++.'
55
s.homepage = 'https://github.com/google/protobuf'
66
s.license = '3-Clause BSD License'

Diff for: ‎Protobuf.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# dependent projects use the :git notation to refer to the library.
66
Pod::Spec.new do |s|
77
s.name = 'Protobuf'
8-
s.version = '3.16.1'
8+
s.version = '3.16.2'
99
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
1010
s.homepage = 'https://github.com/protocolbuffers/protobuf'
1111
s.license = '3-Clause BSD License'

Diff for: ‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ AC_PREREQ(2.59)
1717
# In the SVN trunk, the version should always be the next anticipated release
1818
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
1919
# the size of one file name in the dist tarfile over the 99-char limit.)
20-
AC_INIT([Protocol Buffers],[3.16.1],[[email protected]],[protobuf])
20+
AC_INIT([Protocol Buffers],[3.16.2],[[email protected]],[protobuf])
2121

2222
AM_MAINTAINER_MODE([enable])
2323

Diff for: ‎csharp/Google.Protobuf.Tools.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>Google Protocol Buffers tools</title>
66
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
77
<description>See project site for more info.</description>
8-
<version>3.16.1</version>
8+
<version>3.16.2</version>
99
<authors>Google Inc.</authors>
1010
<owners>protobuf-packages</owners>
1111
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>

Diff for: ‎csharp/src/Google.Protobuf/Google.Protobuf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
55
<Copyright>Copyright 2015, Google Inc.</Copyright>
66
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
7-
<VersionPrefix>3.16.1</VersionPrefix>
7+
<VersionPrefix>3.16.2</VersionPrefix>
88
<!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
99
<LangVersion>7.2</LangVersion>
1010
<Authors>Google Inc.</Authors>

Diff for: ‎java/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you are using Maven, use the following:
2323
<dependency>
2424
<groupId>com.google.protobuf</groupId>
2525
<artifactId>protobuf-java</artifactId>
26-
<version>3.15.3</version>
26+
<version>3.16.2</version>
2727
</dependency>
2828
```
2929

@@ -37,15 +37,15 @@ protobuf-java-util package:
3737
<dependency>
3838
<groupId>com.google.protobuf</groupId>
3939
<artifactId>protobuf-java-util</artifactId>
40-
<version>3.15.3</version>
40+
<version>3.16.2</version>
4141
</dependency>
4242
```
4343

4444
### Gradle
4545

4646
If you are using Gradle, add the following to your `build.gradle` file's dependencies:
4747
```
48-
implementation 'com.google.protobuf:protobuf-java:3.11.0'
48+
implementation 'com.google.protobuf:protobuf-java:3.16.2'
4949
```
5050
Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.
5151

Diff for: ‎java/bom/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.protobuf</groupId>
66
<artifactId>protobuf-bom</artifactId>
7-
<version>3.16.1</version>
7+
<version>3.16.2</version>
88
<packaging>pom</packaging>
99

1010
<name>Protocol Buffers [BOM]</name>

Diff for: ‎java/core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.protobuf</groupId>
66
<artifactId>protobuf-parent</artifactId>
7-
<version>3.16.1</version>
7+
<version>3.16.2</version>
88
</parent>
99

1010
<artifactId>protobuf-java</artifactId>

Diff for: ‎java/lite.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protobuf Java runtime. If you are using Maven, use the following:
3030
<dependency>
3131
<groupId>com.google.protobuf</groupId>
3232
<artifactId>protobuf-javalite</artifactId>
33-
<version>3.9.1</version>
33+
<version>3.16.2</version>
3434
</dependency>
3535
```
3636

Diff for: ‎java/lite/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.protobuf</groupId>
66
<artifactId>protobuf-parent</artifactId>
7-
<version>3.16.1</version>
7+
<version>3.16.2</version>
88
</parent>
99

1010
<artifactId>protobuf-javalite</artifactId>

Diff for: ‎java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.protobuf</groupId>
66
<artifactId>protobuf-parent</artifactId>
7-
<version>3.16.1</version>
7+
<version>3.16.2</version>
88
<packaging>pom</packaging>
99

1010
<name>Protocol Buffers [Parent]</name>

Diff for: ‎java/util/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.protobuf</groupId>
66
<artifactId>protobuf-parent</artifactId>
7-
<version>3.16.1</version>
7+
<version>3.16.2</version>
88
</parent>
99

1010
<artifactId>protobuf-java-util</artifactId>

Diff for: ‎php/ext/google/protobuf/package.xml

+20-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<package packagerversion="1.9.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
2+
<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.5" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
33
<name>protobuf</name>
44
<channel>pecl.php.net</channel>
55
<summary>Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.</summary>
@@ -10,11 +10,11 @@
1010
<email>[email protected]</email>
1111
<active>yes</active>
1212
</lead>
13-
<date>2022-01-05</date>
14-
<time>16:51:15</time>
13+
<date>2022-09-13</date>
14+
<time>11:23:12</time>
1515
<version>
16-
<release>3.16.1</release>
17-
<api>3.16.1</api>
16+
<release>3.16.2</release>
17+
<api>3.16.2</api>
1818
</version>
1919
<stability>
2020
<release>stable</release>
@@ -964,5 +964,20 @@ G A release.
964964
<notes>
965965
</notes>
966966
</release>
967+
<release>
968+
<version>
969+
<release>3.16.2</release>
970+
<api>3.16.2</api>
971+
</version>
972+
<stability>
973+
<release>stable</release>
974+
<api>stable</api>
975+
</stability>
976+
<date>2022-09-13</date>
977+
<time>11:23:12</time>
978+
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
979+
<notes>
980+
</notes>
981+
</release>
967982
</changelog>
968983
</package>

Diff for: ‎php/ext/google/protobuf/protobuf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
7676
ZEND_ARG_INFO(0, value)
7777
ZEND_END_ARG_INFO()
7878

79-
#define PHP_PROTOBUF_VERSION "3.16.1"
79+
#define PHP_PROTOBUF_VERSION "3.16.2"
8080

8181
// ptr -> PHP object cache. This is a weak map that caches lazily-created
8282
// wrapper objects around upb types:

Diff for: ‎protoc-artifacts/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</parent>
99
<groupId>com.google.protobuf</groupId>
1010
<artifactId>protoc</artifactId>
11-
<version>3.16.1</version>
11+
<version>3.16.2</version>
1212
<packaging>pom</packaging>
1313
<name>Protobuf Compiler</name>
1414
<description>

Diff for: ‎python/google/protobuf/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030

3131
# Copyright 2007 Google Inc. All Rights Reserved.
3232

33-
__version__ = '3.16.1'
33+
__version__ = '3.16.2'

Diff for: ‎ruby/google-protobuf.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |s|
22
s.name = "google-protobuf"
3-
s.version = "3.16.1"
3+
s.version = "3.16.2"
44
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
55
s.licenses = ["BSD-3-Clause"]
66
s.summary = "Protocol Buffers"

Diff for: ‎src/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
PTHREAD_DEF =
1919
endif
2020

21-
PROTOBUF_VERSION = 27:1:0
21+
PROTOBUF_VERSION = 27:2:0
2222

2323
if GCC
2424
# Turn on all warnings except for sign comparison (we ignore sign comparison

Diff for: ‎src/google/protobuf/any.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/api.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/compiler/plugin.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/descriptor.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/duration.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/empty.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/field_mask.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/port_def.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337

338338
// Shared google3/opensource definitions. //////////////////////////////////////
339339

340-
#define PROTOBUF_VERSION 3016001
340+
#define PROTOBUF_VERSION 3016002
341341
#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3016000
342342
#define PROTOBUF_MIN_PROTOC_VERSION 3016000
343343
#define PROTOBUF_VERSION_SUFFIX ""

Diff for: ‎src/google/protobuf/source_context.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/struct.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/stubs/common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ namespace internal {
8282

8383
// The current version, represented as a single integer to make comparison
8484
// easier: major * 10^6 + minor * 10^3 + micro
85-
#define GOOGLE_PROTOBUF_VERSION 3016001
85+
#define GOOGLE_PROTOBUF_VERSION 3016002
8686

8787
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
8888
#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""

Diff for: ‎src/google/protobuf/timestamp.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/type.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/google/protobuf/wrappers.pb.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎version.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"3.16.x": {
3-
"protoc_version": "16.2-dev",
3+
"protoc_version": "16.2",
44
"lts": true,
5-
"date": "2022-01-05",
5+
"date": "2022-09-13",
66
"languages": {
7-
"cpp": "3.16.2-dev",
8-
"csharp": "3.16.2-dev",
9-
"java": "3.16.2-dev",
10-
"javascript": "3.16.2-dev",
11-
"objectivec": "3.16.2-dev",
12-
"php": "3.16.2-dev",
13-
"python": "3.16.2-dev",
14-
"ruby": "3.16.2-dev"
7+
"cpp": "3.16.2",
8+
"csharp": "3.16.2",
9+
"java": "3.16.2",
10+
"javascript": "3.16.2",
11+
"objectivec": "3.16.2",
12+
"php": "3.16.2",
13+
"python": "3.16.2",
14+
"ruby": "3.16.2"
1515
}
1616
}
17-
}
17+
}

0 commit comments

Comments
 (0)