diff --git a/dumper/app/build.gradle b/dumper/app/build.gradle index ec6381a34..f3bbcad5b 100644 --- a/dumper/app/build.gradle +++ b/dumper/app/build.gradle @@ -87,6 +87,18 @@ dependencies { implementation libs.jackson.dataformat.yaml implementation libs.jackson.datatype.guava implementation libs.google.cloud.bigquery + + //Overrides for google-cloud-bigquery transient deps + implementation libs.grpc.netty.shaded // explicit version for vulnerabilities update + implementation libs.grpc.protobuf // explicit version for vulnerabilities update + implementation libs.grpc.stub // explicit version for vulnerabilities update + implementation libs.grpc.auth // explicit version for vulnerabilities update + implementation libs.grpc.opentelemetry // explicit version for vulnerabilities update + implementation libs.grpc.services // explicit version for vulnerabilities update + implementation libs.grpc.rls // explicit version for vulnerabilities update + implementation libs.grpc.xds // explicit version for vulnerabilities update + implementation libs.grpc.bom // explicit version for vulnerabilities update + implementation libs.google.cloud.nio implementation libs.google.cloud.kms implementation libs.httpclient5 diff --git a/dumper/app/gradle.lockfile b/dumper/app/gradle.lockfile index af04f519f..898d6a76c 100644 --- a/dumper/app/gradle.lockfile +++ b/dumper/app/gradle.lockfile @@ -106,23 +106,24 @@ commons-io:commons-io:2.19.0=compileClasspath,runtimeClasspath,testCompileClassp commons-net:commons-net:3.9.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath dnsjava:dnsjava:3.6.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-core:3.2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-opentelemetry:1.69.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-rls:1.69.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-services:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-xds:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath +io.grpc:grpc-core:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath +io.grpc:grpc-opentelemetry:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath +io.grpc:grpc-services:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath +io.grpc:grpc-rls:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath +io.grpc:grpc-xds:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath io.netty:netty-buffer:4.1.127.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.127.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.netty:netty-common:4.1.127.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dumper/lib-ext-bigquery/build.gradle b/dumper/lib-ext-bigquery/build.gradle index a28f5024b..1a93ccf0d 100644 --- a/dumper/lib-ext-bigquery/build.gradle +++ b/dumper/lib-ext-bigquery/build.gradle @@ -21,6 +21,13 @@ plugins { dependencies { implementation "com.swrve:rate-limited-logger" implementation "com.google.cloud:google-cloud-bigquery" + + //Overrides for google-cloud-bigquery transient deps + implementation libs.grpc.netty.shaded // explicit version for vulnerabilities update + implementation libs.grpc.protobuf // explicit version for vulnerabilities update + implementation libs.grpc.stub // explicit version for vulnerabilities update + implementation libs.grpc.auth // explicit version for vulnerabilities update + implementation libs.grpc.bom // explicit version for vulnerabilities update } dependencyLocking { diff --git a/dumper/lib-ext-bigquery/gradle.lockfile b/dumper/lib-ext-bigquery/gradle.lockfile index fb29a1943..04a935999 100644 --- a/dumper/lib-ext-bigquery/gradle.lockfile +++ b/dumper/lib-ext-bigquery/gradle.lockfile @@ -42,8 +42,8 @@ com.google.code.gson:gson:2.12.1=compileClasspath,runtimeClasspath,testCompileCl com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor,testFixturesCompileClasspath com.google.errorprone:error_prone_annotations:2.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:24.3.25=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor,testFixturesCompileClasspath -com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor,testFixturesCompileClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.guava:guava-parent:32.1.2-jre=testFixturesCompileClasspath com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor com.google.guava:guava:32.1.2-jre=testFixturesCompileClasspath @@ -60,19 +60,20 @@ com.google.protobuf:protobuf-java-util:3.25.8=compileClasspath,runtimeClasspath, com.google.protobuf:protobuf-java:3.25.8=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.swrve:rate-limited-logger:2.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath commons-codec:commons-codec:1.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-alts:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-auth:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-googleapis:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-grpclb:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-inprocess:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.71.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -io.grpc:grpc-util:1.71.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-alts:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-auth:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath +io.grpc:grpc-core:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-googleapis:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-grpclb:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-netty-shaded:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.76.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.76.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,compileClasspath,testCompileClasspath io.netty:netty-buffer:4.1.110.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.netty:netty-common:4.1.110.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0b8b81bf1..71b7c652e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -76,6 +76,7 @@ jetty-server = "9.4.58.v20250814" netty-handler = "4.1.127.Final" dnsjava = "3.6.3" nimbus-jose-jwt = "9.37.4" +io-grpc = "1.76.0" [libraries] apache-avro = { module = "org.apache.avro:avro", version.ref = "apache-avro" } @@ -97,6 +98,15 @@ datanucleus-core = { module = "org.datanucleus:datanucleus-core", version.ref = datanucleus-javax-jdo = { module = "org.datanucleus:javax.jdo", version.ref = "datanucleus-javax-jdo" } datanucleus-rdbms = { module = "org.datanucleus:datanucleus-rdbms", version.ref = "datanucleus-rdbms" } google-cloud-bigquery = { module = "com.google.cloud:google-cloud-bigquery", version.ref = "google-cloud-bigquery" } +grpc-netty-shaded = { module = "io.grpc:grpc-netty-shaded", version.ref = "io-grpc" } +grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "io-grpc" } +grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "io-grpc" } +grpc-auth = { module = "io.grpc:grpc-auth", version.ref = "io-grpc" } +grpc-opentelemetry = { module = "io.grpc:grpc-opentelemetry", version.ref = "io-grpc" } +grpc-services = { module = "io.grpc:grpc-services", version.ref = "io-grpc" } +grpc-rls = { module = "io.grpc:grpc-rls", version.ref = "io-grpc" } +grpc-xds = { module = "io.grpc:grpc-xds", version.ref = "io-grpc" } +grpc-bom = { module = "io.grpc:grpc-bom", version.ref = "io-grpc" } google-cloud-bigquerydatatransfer = { module = "com.google.cloud:google-cloud-bigquerydatatransfer", version.ref = "google-cloud-bigquerydatatransfer" } google-cloud-kms = { module = "com.google.cloud:google-cloud-kms", version.ref = "google-cloud-kms" } google-cloud-logging = { module = "com.google.cloud:google-cloud-logging", version.ref = "google-cloud-logging"}