Skip to content

Commit db456c1

Browse files
david-leifkerdavid-leifker
authored
chore(): pin Guava via externalDependency and unify resolution (#17202)
1 parent d6fb1d4 commit db456c1

60 files changed

Lines changed: 212 additions & 291 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ project.ext.externalDependency = [
171171
'gson': 'com.google.code.gson:gson:2.12.0',
172172
'guice': 'com.google.inject:guice:7.0.0',
173173
'guicePlay': 'com.google.inject:guice:5.0.1', // Used for frontend while still on old Play version
174-
'guava': 'com.google.guava:guava:32.1.3-jre',
174+
'guava': 'com.google.guava:guava:33.6.0-jre',
175175
'h2': 'com.h2database:h2:2.2.224',
176176
'hadoopCommon':'org.apache.hadoop:hadoop-common:2.7.2',
177177
'hadoopMapreduceClient':'org.apache.hadoop:hadoop-mapreduce-client-core:2.7.2',
@@ -511,6 +511,7 @@ configure(subprojects.findAll {! it.name.startsWith('spark-lineage')}) {
511511
details.because("gRPC stack aligned to ${rootProject.ext.grpcVersion} (incl. grpc-stub with grpc-netty-shaded)")
512512
}
513513
}
514+
resolutionStrategy.force rootProject.ext.externalDependency.get('guava')
514515
resolutionStrategy.force 'at.yawk.lz4:lz4-java:1.10.1'
515516
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-core:${rootProject.ext.jacksonVersion}" // GHSA-72hv-8253-57qq (e.g. from hazelcast)
516517
resolutionStrategy.force "com.fasterxml.jackson.core:jackson-annotations:${rootProject.ext.jacksonVersion}"

‎buildSrc/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ dependencies {
1919
exclude group: 'com.google.guava', module: 'guava'
2020
}
2121
implementation 'com.github.java-json-tools:json-schema-validator:2.2.14'
22-
implementation 'com.google.guava:guava:32.1.2-jre'
22+
// Keep in sync with project.ext.externalDependency['guava'] in root build.gradle
23+
implementation 'com.google.guava:guava:33.6.0-jre'
2324
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.6'
2425
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.6'
2526
implementation 'commons-io:commons-io:2.17.0'

‎contrib/metadata-model-extensions/datahub-demo-dataset-governance-validator/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ repositories {
1010
mavenCentral()
1111
}
1212

13+
def datahubRoot = file('../../../')
14+
1315
dependencies {
1416
// DataHub dependencies (using file dependencies that work from contrib/)
1517
// Check if we're building from within DataHub repo
16-
def datahubRoot = file('../../../')
1718
def entityRegistryJar = file("${datahubRoot}/entity-registry/build/libs/entity-registry.jar")
1819
def liUtilsJar = file("${datahubRoot}/li-utils/build/libs/li-utils.jar")
1920
def metadataModelsJar = file("${datahubRoot}/metadata-models/build/libs/metadata-models.jar")
@@ -34,7 +35,8 @@ dependencies {
3435

3536
// Core dependencies needed for compilation
3637
implementation 'org.slf4j:slf4j-api:1.7.36'
37-
implementation 'com.google.guava:guava:31.1-jre'
38+
// Keep in sync with project.ext.externalDependency['guava'] in root build.gradle
39+
implementation 'com.google.guava:guava:33.6.0-jre'
3840
implementation 'javax.annotation:javax.annotation-api:1.3.2'
3941

4042
// Testing

‎datahub-frontend/gradle.lockfile‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,16 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,runtimeClasspat
3939
com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath
4040
com.google.api.grpc:proto-google-common-protos:2.63.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4141
com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler
42-
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
42+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4343
com.google.code.gson:gson:2.12.0=compileClasspath,javaScriptCompiler,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4444
com.google.crypto.tink:tink:1.21.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
45-
com.google.errorprone:error_prone_annotations:2.36.0=javaScriptCompiler
46-
com.google.errorprone:error_prone_annotations:2.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
47-
com.google.errorprone:error_prone_annotations:2.5.1=play
48-
com.google.guava:failureaccess:1.0.1=play
49-
com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
50-
com.google.guava:guava:18.0=javaScriptCompiler
51-
com.google.guava:guava:30.1.1-jre=play
52-
com.google.guava:guava:33.5.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
53-
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
45+
com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,javaScriptCompiler,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
46+
com.google.guava:failureaccess:1.0.3=compileClasspath,javaScriptCompiler,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
47+
com.google.guava:guava:33.6.0-jre=compileClasspath,javaScriptCompiler,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
48+
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,javaScriptCompiler,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5449
com.google.inject.extensions:guice-assistedinject:4.2.3=runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5550
com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
56-
com.google.j2objc:j2objc-annotations:1.3=play
57-
com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
51+
com.google.j2objc:j2objc-annotations:3.1=compileClasspath,javaScriptCompiler,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5852
com.google.javascript:closure-compiler-externs:v20141215=javaScriptCompiler
5953
com.google.javascript:closure-compiler:v20141215=javaScriptCompiler
6054
com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -377,7 +371,6 @@ org.bouncycastle:bcprov-jdk18on:1.83=compileClasspath,runtimeClasspath,testCompi
377371
org.bouncycastle:bcutil-jdk18on:1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
378372
org.brotli:dec:0.1.2=testCompileClasspath,testRuntimeClasspath
379373
org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
380-
org.checkerframework:checker-qual:3.8.0=play
381374
org.codehaus.jackson:jackson-core-asl:1.8.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
382375
org.codehaus.mojo:animal-sniffer-annotations:1.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
383376
org.codehaus.plexus:plexus-utils:3.6.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

‎datahub-graphql-core/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath
3838
com.google.api.grpc:proto-google-common-protos:2.63.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3939
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4040
com.google.code.gson:gson:2.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
41-
com.google.errorprone:error_prone_annotations:2.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
41+
com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4242
com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
43-
com.google.guava:guava:33.5.0-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
43+
com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4444
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4545
com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4646
com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

‎datahub-upgrade/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ com.google.android:annotations:4.1.1.4=productionRuntimeClasspath,runtimeClasspa
6262
com.google.api.grpc:proto-google-common-protos:2.63.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6363
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6464
com.google.code.gson:gson:2.12.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
65-
com.google.errorprone:error_prone_annotations:2.45.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
65+
com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6666
com.google.guava:failureaccess:1.0.3=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
67-
com.google.guava:guava:33.5.0-android=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
67+
com.google.guava:guava:33.6.0-jre=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6868
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6969
com.google.inject:guice:4.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7070
com.google.j2objc:j2objc-annotations:3.1=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

‎entity-registry/custom-test-model/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ com.google.api.grpc:proto-google-common-protos:2.63.2=pegasusPlugin,restClient,r
1515
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,dataTemplate,dataTemplateCompile,pegasusPlugin,restClient,restClientCompile,runtimeClasspath,testCompileClasspath,testDataTemplate,testRestClient,testRuntimeClasspath
1616
com.google.code.gson:gson:2.12.0=pegasusPlugin,restClient,restClientCompile,testRestClient
1717
com.google.errorprone:error_prone_annotations:2.3.3=compileClasspath,dataTemplate,dataTemplateCompile,runtimeClasspath,testCompileClasspath,testDataTemplate,testRuntimeClasspath
18-
com.google.errorprone:error_prone_annotations:2.45.0=pegasusPlugin,restClient,restClientCompile,testRestClient
18+
com.google.errorprone:error_prone_annotations:2.47.0=pegasusPlugin,restClient,restClientCompile,testRestClient
1919
com.google.guava:failureaccess:1.0.3=pegasusPlugin,restClient,restClientCompile,testRestClient
20-
com.google.guava:guava:33.5.0-android=pegasusPlugin,restClient,restClientCompile,testRestClient
20+
com.google.guava:guava:33.6.0-jre=pegasusPlugin,restClient,restClientCompile,testRestClient
2121
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=pegasusPlugin,restClient,restClientCompile,testRestClient
2222
com.google.j2objc:j2objc-annotations:3.1=pegasusPlugin,restClient,restClientCompile,testRestClient
2323
com.google.protobuf:protobuf-java-util:3.25.5=pegasusPlugin,restClient,restClientCompile,testRestClient

‎entity-registry/gradle.lockfile‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,12 @@ com.google.android:annotations:4.1.1.4=pegasusPlugin,restClient,restClientCompil
2929
com.google.api.grpc:proto-google-common-protos:2.63.2=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
3030
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,dataModel,dataTemplate,dataTemplateCompile,pegasusPlugin,restClient,restClientCompile,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRestClient,testRuntimeClasspath
3131
com.google.code.gson:gson:2.12.0=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
32-
com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,dataModel,dataTemplate,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesRuntimeClasspath
3332
com.google.errorprone:error_prone_annotations:2.3.3=dataTemplateCompile,testFixturesCompileClasspath
34-
com.google.errorprone:error_prone_annotations:2.45.0=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
35-
com.google.guava:failureaccess:1.0.1=compileClasspath,dataModel,dataTemplate,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesRuntimeClasspath
36-
com.google.guava:failureaccess:1.0.3=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
37-
com.google.guava:guava:32.1.3-jre=compileClasspath,dataModel,dataTemplate,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesRuntimeClasspath
38-
com.google.guava:guava:33.5.0-android=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
33+
com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,dataModel,dataTemplate,pegasusPlugin,restClient,restClientCompile,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesRuntimeClasspath,testRestClient,testRuntimeClasspath
34+
com.google.guava:failureaccess:1.0.3=compileClasspath,dataModel,dataTemplate,pegasusPlugin,restClient,restClientCompile,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesRuntimeClasspath,testRestClient,testRuntimeClasspath
35+
com.google.guava:guava:33.6.0-jre=compileClasspath,dataModel,dataTemplate,pegasusPlugin,restClient,restClientCompile,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesRuntimeClasspath,testRestClient,testRuntimeClasspath
3936
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,dataModel,dataTemplate,pegasusPlugin,restClient,restClientCompile,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesRuntimeClasspath,testRestClient,testRuntimeClasspath
40-
com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath
41-
com.google.j2objc:j2objc-annotations:3.1=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
37+
com.google.j2objc:j2objc-annotations:3.1=compileClasspath,dataModel,dataTemplate,pegasusPlugin,restClient,restClientCompile,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesRuntimeClasspath,testRestClient,testRuntimeClasspath
4238
com.google.protobuf:protobuf-java-util:3.25.5=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
4339
com.google.protobuf:protobuf-java:3.25.8=pegasusPlugin,restClientCompile
4440
com.google.protobuf:protobuf-java:4.32.0=restClient,testRestClient,testRuntimeClasspath
@@ -261,8 +257,7 @@ org.apache.yetus:audience-annotations:0.12.0=pegasusPlugin,restClient,restClient
261257
org.apache.zookeeper:zookeeper-jute:3.8.6=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
262258
org.apache.zookeeper:zookeeper:3.8.6=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
263259
org.assertj:assertj-core:3.11.1=testCompileClasspath,testRuntimeClasspath
264-
org.checkerframework:checker-qual:2.6.0=dataTemplateCompile,pegasusPlugin,restClient,restClientCompile,testFixturesCompileClasspath,testRestClient,testRuntimeClasspath
265-
org.checkerframework:checker-qual:3.37.0=compileClasspath,dataModel,dataTemplate,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesRuntimeClasspath
260+
org.checkerframework:checker-qual:2.6.0=compileClasspath,dataModel,dataTemplate,dataTemplateCompile,pegasusPlugin,restClient,restClientCompile,runtimeClasspath,testCompileClasspath,testDataModel,testDataTemplate,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRestClient,testRuntimeClasspath
266261
org.codehaus.jackson:jackson-core-asl:1.4.2=testCompileClasspath
267262
org.codehaus.jackson:jackson-core-asl:1.8.8=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath
268263
org.codehaus.mojo:animal-sniffer-annotations:1.26=pegasusPlugin,restClient,restClientCompile,testRestClient,testRuntimeClasspath

‎ingestion-scheduler/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath
3838
com.google.api.grpc:proto-google-common-protos:2.63.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3939
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4040
com.google.code.gson:gson:2.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
41-
com.google.errorprone:error_prone_annotations:2.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
41+
com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4242
com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
43-
com.google.guava:guava:33.5.0-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
43+
com.google.guava:guava:33.6.0-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4444
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4545
com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4646
com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)