From 2efdcadd23888febfa954ef11bc36b60d8497a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Fri, 15 Sep 2023 17:18:59 -0600 Subject: [PATCH 1/3] Update guava version to 32.1.2-jre --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4db6206f78d..83909bd65f0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { dependencies { // https://github.com/melix/japicmp-gradle-plugin/issues/36 - classpath 'com.google.guava:guava:30.1.1-jre' + classpath 'com.google.guava:guava:32.1.2-jre' classpath 'com.github.tjni.captainhook:captain-hook:0.1.5' } } From 41732259c57fa107fa2b83fe9bb4970b2cfaddf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Fri, 15 Sep 2023 17:43:05 -0600 Subject: [PATCH 2/3] Exclude guava from docker-java-core --- core/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index f8dad5e4c6e..22af2f3eebf 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -93,10 +93,13 @@ dependencies { api "com.github.docker-java:docker-java-api" - shaded 'com.github.docker-java:docker-java-core' + shaded('com.github.docker-java:docker-java-core') { + exclude group: 'com.google.guava', module: 'guava' + } api 'com.github.docker-java:docker-java-transport-zerodep' + shaded 'com.google.guava:guava:32.1.2-jre' shaded "org.yaml:snakeyaml:1.33" shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2' From b81229cd51a0a926d79cba95c342952276df5234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Fri, 15 Sep 2023 17:48:52 -0600 Subject: [PATCH 3/3] Exclude guava from jib-core --- core/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index 22af2f3eebf..87db776001c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -106,7 +106,9 @@ dependencies { shaded 'org.zeroturnaround:zt-exec:1.12' - testImplementation 'com.google.cloud.tools:jib-core:0.23.0' + testImplementation('com.google.cloud.tools:jib-core:0.23.0') { + exclude group: 'com.google.guava', module: 'guava' + } testImplementation 'org.apache.httpcomponents:httpclient:4.5.9' testImplementation 'redis.clients:jedis:5.0.0' testImplementation 'com.rabbitmq:amqp-client:5.18.0'