grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update protobuf-java to address CVE-2024-7254 

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
This commit is contained in:
Mark S. Lewis 2024-09-20 16:14:59 +01:00 committed by Eric Anderson
parent 99be6e9852
commit 2ff837ab60
25 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/build.gradle
View File

@ -24,7 +24,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.5'
def protocVersion = protobufVersion def protocVersion = protobufVersion
dependencies { dependencies {

2
examples/example-alts/build.gradle
View File

@ -25,7 +25,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.5'
dependencies { dependencies {
// grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub // grpc-alts transitively depends on grpc-netty-shaded, grpc-protobuf, and grpc-stub

2
examples/example-debug/build.gradle
View File

@ -26,7 +26,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.5'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-debug/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.5</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

2
examples/example-dualstack/build.gradle
View File

@ -26,7 +26,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.5'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-dualstack/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.5</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

2
examples/example-gauth/build.gradle
View File

@ -25,7 +25,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.5'
def protocVersion = protobufVersion def protocVersion = protobufVersion

2
examples/example-gauth/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.25.3</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

2
examples/example-gcp-csm-observability/build.gradle
View File

@ -26,7 +26,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.5'
def openTelemetryVersion = '1.40.0' def openTelemetryVersion = '1.40.0'
def openTelemetryPrometheusVersion = '1.40.0-alpha' def openTelemetryPrometheusVersion = '1.40.0-alpha'

2
examples/example-gcp-observability/build.gradle
View File

@ -26,7 +26,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.5'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-hostname/build.gradle
View File

@ -24,7 +24,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.5'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-hostname/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.5</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

2
examples/example-jwt-auth/build.gradle
View File

@ -24,7 +24,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.5'
def protocVersion = protobufVersion def protocVersion = protobufVersion
dependencies { dependencies {

4
examples/example-jwt-auth/pom.xml
View File

@ -14,8 +14,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.25.3</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.5</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

2
examples/example-oauth/build.gradle
View File

@ -24,7 +24,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.5'
def protocVersion = protobufVersion def protocVersion = protobufVersion
dependencies { dependencies {

4
examples/example-oauth/pom.xml
View File

@ -14,8 +14,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.25.3</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.5</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

2
examples/example-opentelemetry/build.gradle
View File

@ -25,7 +25,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.5'
def openTelemetryVersion = '1.40.0' def openTelemetryVersion = '1.40.0'
def openTelemetryPrometheusVersion = '1.40.0-alpha' def openTelemetryPrometheusVersion = '1.40.0-alpha'

2
examples/example-orca/build.gradle
View File

@ -19,7 +19,7 @@ java {
} }
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.5'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-reflection/build.gradle
View File

@ -19,7 +19,7 @@ java {
} }
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.5'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-servlet/build.gradle
View File

@ -17,7 +17,7 @@ java {
} }
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.5'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}", implementation "io.grpc:grpc-protobuf:${grpcVersion}",

2
examples/example-tls/build.gradle
View File

@ -25,7 +25,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.5'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

2
examples/example-tls/pom.xml
View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.5</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

2
examples/example-xds/build.gradle
View File

@ -24,7 +24,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.68.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.5'
dependencies { dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}" implementation "io.grpc:grpc-protobuf:${grpcVersion}"

4
examples/pom.xml
View File

@ -13,8 +13,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.68.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.25.3</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.5</protoc.version>
<!-- required for JDK 8 --> <!-- required for JDK 8 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

2
gradle/libs.versions.toml
View File

@ -6,7 +6,7 @@ nettytcnative = '2.0.65.Final'
opencensus = "0.31.1" opencensus = "0.31.1"
# Not upgrading to 4.x as it is not yet ABI compatible. # Not upgrading to 4.x as it is not yet ABI compatible.
# https://github.com/protocolbuffers/protobuf/issues/17247 # https://github.com/protocolbuffers/protobuf/issues/17247
protobuf = "3.25.3" protobuf = "3.25.5"
[libraries] [libraries]
android-annotations = "com.google.android:annotations:4.1.1.4" android-annotations = "com.google.android:annotations:4.1.1.4"