From cb4468b6fe4c8106fbefd816fbb695af29d12cfc Mon Sep 17 00:00:00 2001 From: owaiskazi19 Date: Fri, 7 Jul 2023 16:41:57 +0000 Subject: [PATCH 1/2] Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre in /distribution/tools/upgrade-cli Signed-off-by: owaiskazi19 --- CHANGELOG.md | 2 +- distribution/tools/upgrade-cli/build.gradle | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 045a1cebf4283..b0c5403253b46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -104,7 +104,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Dependencies - Bump `com.azure:azure-storage-common` from 12.21.0 to 12.21.1 (#7566, #7814) -- Bump `com.google.guava:guava` from 30.1.1-jre to 32.0.0-jre (#7565, #7811, #7807, #7808) +- Bump `com.google.guava:guava` from 30.1.1-jre to 32.1.1-jre (#7565, #7811, #7807, #7808, #8402) - Bump `net.minidev:json-smart` from 2.4.10 to 2.4.11 (#7660, #7812) - Bump `org.gradle.test-retry` from 1.5.2 to 1.5.3 (#7810) - Bump `com.diffplug.spotless` from 6.17.0 to 6.18.0 (#7896) diff --git a/distribution/tools/upgrade-cli/build.gradle b/distribution/tools/upgrade-cli/build.gradle index 54d51936159ec..121002953df44 100644 --- a/distribution/tools/upgrade-cli/build.gradle +++ b/distribution/tools/upgrade-cli/build.gradle @@ -21,7 +21,10 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" testImplementation project(":test:framework") testImplementation 'com.google.jimfs:jimfs:1.2' - testRuntimeOnly 'com.google.guava:guava:32.0.1-jre' + testRuntimeOnly 'com.google.guava:guava:32.1.1-jre' + configurations.all { + resolutionStrategy.force("org.mockito:mockito-core:${versions.mockito}") + } } tasks.named("dependencyLicenses").configure { From 76e3acbeefd2a54fa19b9c6594efb5d86f897fe1 Mon Sep 17 00:00:00 2001 From: owaiskazi19 Date: Fri, 7 Jul 2023 17:42:01 +0000 Subject: [PATCH 2/2] Disabled transitive dependencies for test Signed-off-by: owaiskazi19 --- distribution/tools/upgrade-cli/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/distribution/tools/upgrade-cli/build.gradle b/distribution/tools/upgrade-cli/build.gradle index 121002953df44..d81d00440a864 100644 --- a/distribution/tools/upgrade-cli/build.gradle +++ b/distribution/tools/upgrade-cli/build.gradle @@ -21,9 +21,8 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}" testImplementation project(":test:framework") testImplementation 'com.google.jimfs:jimfs:1.2' - testRuntimeOnly 'com.google.guava:guava:32.1.1-jre' - configurations.all { - resolutionStrategy.force("org.mockito:mockito-core:${versions.mockito}") + testRuntimeOnly('com.google.guava:guava:32.1.1-jre') { + transitive = false } }