Skip to content

Commit ba1aab2

Browse files
protobuf-team-botprotobuf-team-bot
committed
Updating version.json and repo version numbers to: 25.0-rc2
1 parent 3f05c09 commit ba1aab2

38 files changed

+54
-54
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS)
7979
endif ()
8080

8181
# Version metadata
82-
set(protobuf_VERSION_STRING "4.25.0-rc-1")
82+
set(protobuf_VERSION_STRING "4.25.0-rc-2")
8383
set(protobuf_DESCRIPTION "Protocol Buffers")
8484
set(protobuf_CONTACT "protobuf@googlegroups.com")
8585

‎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 = '4.25.0-rc1'
3+
s.version = '4.25.0-rc2'
44
s.summary = 'Protocol Buffers v3 runtime library for C++.'
55
s.homepage = 'https://github.com/google/protobuf'
66
s.license = 'BSD-3-Clause'

‎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.25.0-rc1'
8+
s.version = '3.25.0-rc2'
99
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
1010
s.homepage = 'https://github.com/protocolbuffers/protobuf'
1111
s.license = 'BSD-3-Clause'

‎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.25.0-rc1</version>
8+
<version>3.25.0-rc2</version>
99
<authors>Google Inc.</authors>
1010
<owners>protobuf-packages</owners>
1111
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

‎csharp/src/Google.Protobuf/Google.Protobuf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
66
<Copyright>Copyright 2015, Google Inc.</Copyright>
77
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
8-
<VersionPrefix>3.25.0-rc1</VersionPrefix>
8+
<VersionPrefix>3.25.0-rc2</VersionPrefix>
99
<LangVersion>10.0</LangVersion>
1010
<Authors>Google Inc.</Authors>
1111
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

‎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.25.0-rc-1</version>
26+
<version>3.25.0-rc-2</version>
2727
</dependency>
2828
```
2929

@@ -37,14 +37,14 @@ protobuf-java-util package:
3737
<dependency>
3838
<groupId>com.google.protobuf</groupId>
3939
<artifactId>protobuf-java-util</artifactId>
40-
<version>3.25.0-rc-1</version>
40+
<version>3.25.0-rc-2</version>
4141
</dependency>
4242
```
4343

4444
### Gradle
4545

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

‎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.25.0-RC1</version>
7+
<version>3.25.0-RC2</version>
88
<packaging>pom</packaging>
99

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

‎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.25.0-RC1</version>
7+
<version>3.25.0-RC2</version>
88
</parent>
99

1010
<artifactId>protobuf-java</artifactId>

‎java/kotlin-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.25.0-RC1</version>
7+
<version>3.25.0-RC2</version>
88
</parent>
99

1010
<artifactId>protobuf-kotlin-lite</artifactId>

‎java/kotlin/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.25.0-RC1</version>
7+
<version>3.25.0-RC2</version>
88
</parent>
99

1010
<artifactId>protobuf-kotlin</artifactId>

‎java/lite.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
2929
<dependency>
3030
<groupId>com.google.protobuf</groupId>
3131
<artifactId>protobuf-javalite</artifactId>
32-
<version>3.25.0-rc-1</version>
32+
<version>3.25.0-rc-2</version>
3333
</dependency>
3434
```
3535

‎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.25.0-RC1</version>
7+
<version>3.25.0-RC2</version>
88
</parent>
99

1010
<artifactId>protobuf-javalite</artifactId>

‎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.25.0-RC1</version>
7+
<version>3.25.0-RC2</version>
88
<packaging>pom</packaging>
99

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

‎java/protoc/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.25.0-RC1</version>
11+
<version>3.25.0-RC2</version>
1212
<packaging>pom</packaging>
1313
<name>Protobuf Compiler</name>
1414
<description>

‎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.25.0-RC1</version>
7+
<version>3.25.0-RC2</version>
88
</parent>
99

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

‎php/ext/google/protobuf/protobuf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
3232
ZEND_ARG_INFO(0, value)
3333
ZEND_END_ARG_INFO()
3434

35-
#define PHP_PROTOBUF_VERSION "3.25.0RC1"
35+
#define PHP_PROTOBUF_VERSION "3.25.0RC2"
3636

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

‎protobuf_version.bzl

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
""" Contains version numbers to be used in other bzl files """
2-
PROTOC_VERSION = "25.0-rc-1"
3-
PROTOBUF_JAVA_VERSION = "3.25.0-RC1"
4-
PROTOBUF_PYTHON_VERSION = "4.25.0rc1"
5-
PROTOBUF_PHP_VERSION = "3.25.0RC1"
6-
PROTOBUF_RUBY_VERSION = "3.25.0.rc.1"
2+
PROTOC_VERSION = "25.0-rc-2"
3+
PROTOBUF_JAVA_VERSION = "3.25.0-RC2"
4+
PROTOBUF_PYTHON_VERSION = "4.25.0rc2"
5+
PROTOBUF_PHP_VERSION = "3.25.0RC2"
6+
PROTOBUF_RUBY_VERSION = "3.25.0.rc.2"

‎python/google/protobuf/__init__.py

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

88
# Copyright 2007 Google Inc. All Rights Reserved.
99

10-
__version__ = '4.25.0rc1'
10+
__version__ = '4.25.0rc2'

‎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.25.0.rc.1"
3+
s.version = "3.25.0.rc.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"

‎ruby/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<groupId>com.google.protobuf.jruby</groupId>
1111
<artifactId>protobuf-jruby</artifactId>
12-
<version>3.25.0-RC1</version>
12+
<version>3.25.0-RC2</version>
1313
<name>Protocol Buffer JRuby native extension</name>
1414
<description>
1515
Protocol Buffers are a way of encoding structured data in an efficient yet
@@ -76,7 +76,7 @@
7676
<dependency>
7777
<groupId>com.google.protobuf</groupId>
7878
<artifactId>protobuf-java-util</artifactId>
79-
<version>3.25.0-RC1</version>
79+
<version>3.25.0-RC2</version>
8080
</dependency>
8181
<dependency>
8282
<groupId>org.jruby</groupId>

‎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.

‎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.

‎src/google/protobuf/compiler/java/java_features.pb.h

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

‎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.

‎src/google/protobuf/compiler/versions_suffix.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
//
2222
// Please avoid changing it manually, as they should be updated automatically by
2323
// the Protobuf release process.
24-
#define PROTOBUF_GENCODE_VERSION_SUFFIX "-rc1"
24+
#define PROTOBUF_GENCODE_VERSION_SUFFIX "-rc2"
2525

2626
#endif // GOOGLE_PROTOBUF_COMPILER_VERSIONS_SUFFIX_H__

‎src/google/protobuf/cpp_features.pb.h

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

‎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.

‎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.

‎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.

‎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.

‎src/google/protobuf/port_def.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
219219
#ifdef PROTOBUF_VERSION_SUFFIX
220220
#error PROTOBUF_VERSION_SUFFIX was previously defined
221221
#endif
222-
#define PROTOBUF_VERSION_SUFFIX "-rc1"
222+
#define PROTOBUF_VERSION_SUFFIX "-rc2"
223223

224224
#ifdef PROTOBUF_MINIMUM_EDITION
225225
#error PROTOBUF_MINIMUM_EDITION was previously defined

‎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.

‎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.

‎src/google/protobuf/stubs/common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace internal {
4747
#define GOOGLE_PROTOBUF_VERSION 4025000
4848

4949
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
50-
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1"
50+
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc2"
5151

5252
// The minimum header version which works with the current version of
5353
// the library. This constant should only be used by protoc's C++ code

‎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.

‎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.

‎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.

‎version.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"25.x": {
3-
"protoc_version": "25.0-dev",
3+
"protoc_version": "25.0-rc2",
44
"lts": false,
5-
"date": "2023-10-16",
5+
"date": "2023-10-18",
66
"languages": {
7-
"cpp": "4.25.0-dev",
8-
"csharp": "3.25.0-dev",
9-
"java": "3.25.0-dev",
10-
"javascript": "3.25.0-dev",
11-
"objectivec": "3.25.0-dev",
12-
"php": "3.25.0-dev",
13-
"python": "4.25.0-dev",
14-
"ruby": "3.25.0-dev"
7+
"cpp": "4.25.0-rc2",
8+
"csharp": "3.25.0-rc2",
9+
"java": "3.25.0-rc2",
10+
"javascript": "3.25.0-rc2",
11+
"objectivec": "3.25.0-rc2",
12+
"php": "3.25.0-rc2",
13+
"python": "4.25.0-rc2",
14+
"ruby": "3.25.0-rc2"
1515
}
1616
}
1717
}

0 commit comments

Comments
 (0)