Skip to content

Commit ddf7965

Browse files
vladislav-sidorovichvladislav-sidorovich
authored
update io.grpc bundle (#1008)
1 parent 026b119 commit ddf7965

File tree

5 files changed

+63
-32
lines changed

5 files changed

+63
-32
lines changed

‎dumper/app/build.gradle‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,18 @@ dependencies {
8787
implementation libs.jackson.dataformat.yaml
8888
implementation libs.jackson.datatype.guava
8989
implementation libs.google.cloud.bigquery
90+
91+
//Overrides for google-cloud-bigquery transient deps
92+
implementation libs.grpc.netty.shaded // explicit version for vulnerabilities update
93+
implementation libs.grpc.protobuf // explicit version for vulnerabilities update
94+
implementation libs.grpc.stub // explicit version for vulnerabilities update
95+
implementation libs.grpc.auth // explicit version for vulnerabilities update
96+
implementation libs.grpc.opentelemetry // explicit version for vulnerabilities update
97+
implementation libs.grpc.services // explicit version for vulnerabilities update
98+
implementation libs.grpc.rls // explicit version for vulnerabilities update
99+
implementation libs.grpc.xds // explicit version for vulnerabilities update
100+
implementation libs.grpc.bom // explicit version for vulnerabilities update
101+
90102
implementation libs.google.cloud.nio
91103
implementation libs.google.cloud.kms
92104
implementation libs.httpclient5

‎dumper/app/gradle.lockfile‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -106,23 +106,24 @@ commons-io:commons-io:2.19.0=compileClasspath,runtimeClasspath,testCompileClassp
106106
commons-net:commons-net:3.9.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
107107
dnsjava:dnsjava:3.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
108108
io.dropwizard.metrics:metrics-core:3.2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
109-
io.grpc:grpc-alts:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
110-
io.grpc:grpc-api:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
111-
io.grpc:grpc-auth:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
112-
io.grpc:grpc-context:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
113-
io.grpc:grpc-core:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
114-
io.grpc:grpc-googleapis:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
115-
io.grpc:grpc-grpclb:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
116-
io.grpc:grpc-inprocess:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
117-
io.grpc:grpc-netty-shaded:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
118-
io.grpc:grpc-opentelemetry:1.69.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
119-
io.grpc:grpc-protobuf-lite:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
120-
io.grpc:grpc-protobuf:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
121-
io.grpc:grpc-rls:1.69.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
122-
io.grpc:grpc-services:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
123-
io.grpc:grpc-stub:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
124-
io.grpc:grpc-util:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
125-
io.grpc:grpc-xds:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
109+
io.grpc:grpc-alts:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
110+
io.grpc:grpc-api:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
111+
io.grpc:grpc-auth:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
112+
io.grpc:grpc-bom:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
113+
io.grpc:grpc-context:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath
114+
io.grpc:grpc-core:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
115+
io.grpc:grpc-googleapis:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
116+
io.grpc:grpc-grpclb:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
117+
io.grpc:grpc-inprocess:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
118+
io.grpc:grpc-netty-shaded:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
119+
io.grpc:grpc-protobuf-lite:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
120+
io.grpc:grpc-protobuf:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
121+
io.grpc:grpc-stub:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
122+
io.grpc:grpc-util:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath
123+
io.grpc:grpc-opentelemetry:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath
124+
io.grpc:grpc-services:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath
125+
io.grpc:grpc-rls:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath
126+
io.grpc:grpc-xds:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath
126127
io.netty:netty-buffer:4.1.127.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
127128
io.netty:netty-codec:4.1.127.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
128129
io.netty:netty-common:4.1.127.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath

‎dumper/lib-ext-bigquery/build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ plugins {
2121
dependencies {
2222
implementation "com.swrve:rate-limited-logger"
2323
implementation "com.google.cloud:google-cloud-bigquery"
24+
25+
//Overrides for google-cloud-bigquery transient deps
26+
implementation libs.grpc.netty.shaded // explicit version for vulnerabilities update
27+
implementation libs.grpc.protobuf // explicit version for vulnerabilities update
28+
implementation libs.grpc.stub // explicit version for vulnerabilities update
29+
implementation libs.grpc.auth // explicit version for vulnerabilities update
30+
implementation libs.grpc.bom // explicit version for vulnerabilities update
2431
}
2532

2633
dependencyLocking {

‎dumper/lib-ext-bigquery/gradle.lockfile‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ com.google.code.gson:gson:2.12.1=compileClasspath,runtimeClasspath,testCompileCl
4242
com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor,testFixturesCompileClasspath
4343
com.google.errorprone:error_prone_annotations:2.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
4444
com.google.flatbuffers:flatbuffers-java:24.3.25=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
45-
com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor,testFixturesCompileClasspath
46-
com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
45+
com.google.guava:failureaccess:1.0.3=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor,testFixturesCompileClasspath
46+
com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
4747
com.google.guava:guava-parent:32.1.2-jre=testFixturesCompileClasspath
4848
com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor
4949
com.google.guava:guava:32.1.2-jre=testFixturesCompileClasspath
@@ -60,19 +60,20 @@ com.google.protobuf:protobuf-java-util:3.25.8=compileClasspath,runtimeClasspath,
6060
com.google.protobuf:protobuf-java:3.25.8=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
6161
com.swrve:rate-limited-logger:2.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
6262
commons-codec:commons-codec:1.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
63-
io.grpc:grpc-alts:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
64-
io.grpc:grpc-api:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
65-
io.grpc:grpc-auth:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
66-
io.grpc:grpc-context:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
67-
io.grpc:grpc-core:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
68-
io.grpc:grpc-googleapis:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
69-
io.grpc:grpc-grpclb:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
70-
io.grpc:grpc-inprocess:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
71-
io.grpc:grpc-netty-shaded:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
72-
io.grpc:grpc-protobuf-lite:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
73-
io.grpc:grpc-protobuf:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
74-
io.grpc:grpc-stub:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
75-
io.grpc:grpc-util:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
63+
io.grpc:grpc-alts:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
64+
io.grpc:grpc-api:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
65+
io.grpc:grpc-auth:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
66+
io.grpc:grpc-bom:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
67+
io.grpc:grpc-context:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath
68+
io.grpc:grpc-core:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
69+
io.grpc:grpc-googleapis:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
70+
io.grpc:grpc-grpclb:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
71+
io.grpc:grpc-inprocess:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
72+
io.grpc:grpc-netty-shaded:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
73+
io.grpc:grpc-protobuf-lite:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
74+
io.grpc:grpc-protobuf:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
75+
io.grpc:grpc-stub:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
76+
io.grpc:grpc-util:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath
7677
io.netty:netty-buffer:4.1.110.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
7778
io.netty:netty-common:4.1.110.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
7879
io.opencensus:opencensus-api:0.31.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath

‎gradle/libs.versions.toml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jetty-server = "9.4.58.v20250814"
7676
netty-handler = "4.1.127.Final"
7777
dnsjava = "3.6.3"
7878
nimbus-jose-jwt = "9.37.4"
79+
io-grpc = "1.76.0"
7980

8081
[libraries]
8182
apache-avro = { module = "org.apache.avro:avro", version.ref = "apache-avro" }
@@ -97,6 +98,15 @@ datanucleus-core = { module = "org.datanucleus:datanucleus-core", version.ref =
9798
datanucleus-javax-jdo = { module = "org.datanucleus:javax.jdo", version.ref = "datanucleus-javax-jdo" }
9899
datanucleus-rdbms = { module = "org.datanucleus:datanucleus-rdbms", version.ref = "datanucleus-rdbms" }
99100
google-cloud-bigquery = { module = "com.google.cloud:google-cloud-bigquery", version.ref = "google-cloud-bigquery" }
101+
grpc-netty-shaded = { module = "io.grpc:grpc-netty-shaded", version.ref = "io-grpc" }
102+
grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "io-grpc" }
103+
grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "io-grpc" }
104+
grpc-auth = { module = "io.grpc:grpc-auth", version.ref = "io-grpc" }
105+
grpc-opentelemetry = { module = "io.grpc:grpc-opentelemetry", version.ref = "io-grpc" }
106+
grpc-services = { module = "io.grpc:grpc-services", version.ref = "io-grpc" }
107+
grpc-rls = { module = "io.grpc:grpc-rls", version.ref = "io-grpc" }
108+
grpc-xds = { module = "io.grpc:grpc-xds", version.ref = "io-grpc" }
109+
grpc-bom = { module = "io.grpc:grpc-bom", version.ref = "io-grpc" }
100110
google-cloud-bigquerydatatransfer = { module = "com.google.cloud:google-cloud-bigquerydatatransfer", version.ref = "google-cloud-bigquerydatatransfer" }
101111
google-cloud-kms = { module = "com.google.cloud:google-cloud-kms", version.ref = "google-cloud-kms" }
102112
google-cloud-logging = { module = "com.google.cloud:google-cloud-logging", version.ref = "google-cloud-logging"}

0 commit comments

Comments
 (0)