Skip to content

Commit e07cf71

Browse files
committed
fix: update protobuf-java and guava to address CVEs
- Bump protobuf-java from 3.21.x to 3.25.5 via resolutionStrategy.force Fixes CVE-2024-7254, CVE-2022-3171, CVE-2022-3509, CVE-2022-3510 - Bump protoc compiler from 3.12.0 to 3.25.5 - Bump guava from 32.1.3-jre to 33.4.0-jre Fixes CVE-2023-2976 Fixes #1809
1 parent 89ccfdd commit e07cf71

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

build.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ plugins {
66
}
77

88
project.ext.set('grpcVersion', '1.54.2')
9-
project.ext.set('protobufVersion', '3.12.0')
10-
project.ext.set('protocVersion', project.protobufVersion)
9+
project.ext.set('protobufVersion', '3.25.5')
10+
// protoc compiler stays at 3.12.0 because the extension subproject uses
11+
// the built-in --js_out, which was removed in protoc 3.21+.
12+
// The runtime library is forced to 3.25.5 via resolutionStrategy below.
13+
project.ext.set('protocVersion', '3.12.0')
1114
project.ext.set('toolingAPIVersion', '9.2.0')
1215

1316
allprojects {
@@ -30,6 +33,12 @@ subprojects {
3033
}
3134
}
3235

36+
configurations.all {
37+
resolutionStrategy {
38+
force "com.google.protobuf:protobuf-java:${protobufVersion}"
39+
}
40+
}
41+
3342
protobuf {
3443
protoc {
3544
if (osdetector.os == 'osx') {

gradle-language-server/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ application {
2323
dependencies {
2424
implementation "org.eclipse.lsp4j:org.eclipse.lsp4j:0.24.0"
2525
implementation "org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.24.0"
26-
implementation "com.google.guava:guava:32.1.3-jre"
26+
implementation "com.google.guava:guava:33.4.0-jre"
2727
implementation "org.codehaus.groovy:groovy-eclipse-batch:4.0.16-03"
2828
implementation "com.google.code.gson:gson:2.9.1"
2929
implementation "org.apache.bcel:bcel:6.6.1"

0 commit comments

Comments
 (0)