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' } } diff --git a/core/build.gradle b/core/build.gradle index d76f27c0f01..b4ed66c2852 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -93,17 +93,22 @@ 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' 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'