Skip to content

Commit 2ff837a

Browse files
bestbeforetodayejona86
bestbeforetoday
authored and
ejona86
committedSep 24, 2024·
Update protobuf-java to address CVE-2024-7254
Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
·
v1.72.0v1.68.1
1 parent 99be6e9 commit 2ff837a

File tree

25 files changed

+28
-28
lines changed

25 files changed

+28
-28
lines changed
 

Diff for: ‎examples/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.3'
27+
def protobufVersion = '3.25.5'
2828
def protocVersion = protobufVersion
2929

3030
dependencies {

Diff for: ‎examples/example-alts/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ java {
2525
// Feel free to delete the comment at the next line. It is just for safely
2626
// updating the version in our release process.
2727
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
28-
def protocVersion = '3.25.3'
28+
def protocVersion = '3.25.5'
2929

3030
dependencies {
3131
// grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub

Diff for: ‎examples/example-debug/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ java {
2626
// Feel free to delete the comment at the next line. It is just for safely
2727
// updating the version in our release process.
2828
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
29-
def protobufVersion = '3.25.3'
29+
def protobufVersion = '3.25.5'
3030

3131
dependencies {
3232
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

Diff for: ‎examples/example-debug/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protoc.version>3.25.3</protoc.version>
16+
<protoc.version>3.25.5</protoc.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>

Diff for: ‎examples/example-dualstack/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ java {
2626
// Feel free to delete the comment at the next line. It is just for safely
2727
// updating the version in our release process.
2828
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
29-
def protobufVersion = '3.25.3'
29+
def protobufVersion = '3.25.5'
3030

3131
dependencies {
3232
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

Diff for: ‎examples/example-dualstack/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protoc.version>3.25.3</protoc.version>
16+
<protoc.version>3.25.5</protoc.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>

Diff for: ‎examples/example-gauth/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ java {
2525
// Feel free to delete the comment at the next line. It is just for safely
2626
// updating the version in our release process.
2727
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
28-
def protobufVersion = '3.25.3'
28+
def protobufVersion = '3.25.5'
2929
def protocVersion = protobufVersion
3030

3131

Diff for: ‎examples/example-gauth/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protobuf.version>3.25.3</protobuf.version>
16+
<protobuf.version>3.25.5</protobuf.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>

Diff for: ‎examples/example-gcp-csm-observability/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ java {
2626
// Feel free to delete the comment at the next line. It is just for safely
2727
// updating the version in our release process.
2828
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
29-
def protocVersion = '3.25.3'
29+
def protocVersion = '3.25.5'
3030
def openTelemetryVersion = '1.40.0'
3131
def openTelemetryPrometheusVersion = '1.40.0-alpha'
3232

Diff for: ‎examples/example-gcp-observability/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ java {
2626
// Feel free to delete the comment at the next line. It is just for safely
2727
// updating the version in our release process.
2828
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
29-
def protocVersion = '3.25.3'
29+
def protocVersion = '3.25.5'
3030

3131
dependencies {
3232
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

Diff for: ‎examples/example-hostname/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.3'
27+
def protobufVersion = '3.25.5'
2828

2929
dependencies {
3030
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

Diff for: ‎examples/example-hostname/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protoc.version>3.25.3</protoc.version>
16+
<protoc.version>3.25.5</protoc.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>

Diff for: ‎examples/example-jwt-auth/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.3'
27+
def protobufVersion = '3.25.5'
2828
def protocVersion = protobufVersion
2929

3030
dependencies {

Diff for: ‎examples/example-jwt-auth/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
17-
<protobuf.version>3.25.3</protobuf.version>
18-
<protoc.version>3.25.3</protoc.version>
17+
<protobuf.version>3.25.5</protobuf.version>
18+
<protoc.version>3.25.5</protoc.version>
1919
<!-- required for jdk9 -->
2020
<maven.compiler.source>1.8</maven.compiler.source>
2121
<maven.compiler.target>1.8</maven.compiler.target>

Diff for: ‎examples/example-oauth/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protobufVersion = '3.25.3'
27+
def protobufVersion = '3.25.5'
2828
def protocVersion = protobufVersion
2929

3030
dependencies {

Diff for: ‎examples/example-oauth/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
17-
<protobuf.version>3.25.3</protobuf.version>
18-
<protoc.version>3.25.3</protoc.version>
17+
<protobuf.version>3.25.5</protobuf.version>
18+
<protoc.version>3.25.5</protoc.version>
1919
<!-- required for jdk9 -->
2020
<maven.compiler.source>1.8</maven.compiler.source>
2121
<maven.compiler.target>1.8</maven.compiler.target>

Diff for: ‎examples/example-opentelemetry/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ java {
2525
// Feel free to delete the comment at the next line. It is just for safely
2626
// updating the version in our release process.
2727
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
28-
def protocVersion = '3.25.3'
28+
def protocVersion = '3.25.5'
2929
def openTelemetryVersion = '1.40.0'
3030
def openTelemetryPrometheusVersion = '1.40.0-alpha'
3131

Diff for: ‎examples/example-orca/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ java {
1919
}
2020

2121
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
22-
def protocVersion = '3.25.3'
22+
def protocVersion = '3.25.5'
2323

2424
dependencies {
2525
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

Diff for: ‎examples/example-reflection/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ java {
1919
}
2020

2121
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
22-
def protocVersion = '3.25.3'
22+
def protocVersion = '3.25.5'
2323

2424
dependencies {
2525
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

Diff for: ‎examples/example-servlet/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ java {
1717
}
1818

1919
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
20-
def protocVersion = '3.25.3'
20+
def protocVersion = '3.25.5'
2121

2222
dependencies {
2323
implementation "io.grpc:grpc-protobuf:${grpcVersion}",

Diff for: ‎examples/example-tls/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ java {
2525
// Feel free to delete the comment at the next line. It is just for safely
2626
// updating the version in our release process.
2727
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
28-
def protocVersion = '3.25.3'
28+
def protocVersion = '3.25.5'
2929

3030
dependencies {
3131
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

Diff for: ‎examples/example-tls/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protoc.version>3.25.3</protoc.version>
16+
<protoc.version>3.25.5</protoc.version>
1717
<!-- required for jdk9 -->
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>

Diff for: ‎examples/example-xds/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ java {
2424
// Feel free to delete the comment at the next line. It is just for safely
2525
// updating the version in our release process.
2626
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
27-
def protocVersion = '3.25.3'
27+
def protocVersion = '3.25.5'
2828

2929
dependencies {
3030
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

Diff for: ‎examples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
16-
<protobuf.version>3.25.3</protobuf.version>
17-
<protoc.version>3.25.3</protoc.version>
16+
<protobuf.version>3.25.5</protobuf.version>
17+
<protoc.version>3.25.5</protoc.version>
1818
<!-- required for JDK 8 -->
1919
<maven.compiler.source>1.8</maven.compiler.source>
2020
<maven.compiler.target>1.8</maven.compiler.target>

Diff for: ‎gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ nettytcnative = '2.0.65.Final'
66
opencensus = "0.31.1"
77
# Not upgrading to 4.x as it is not yet ABI compatible.
88
# https://github.com/protocolbuffers/protobuf/issues/17247
9-
protobuf = "3.25.3"
9+
protobuf = "3.25.5"
1010

1111
[libraries]
1212
android-annotations = "com.google.android:annotations:4.1.1.4"

0 commit comments

Comments
 (0)
Please sign in to comment.