File tree Expand file tree Collapse file tree 2 files changed +8
-3
lines changed
Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ buildscript {
55
66 dependencies {
77 // https://github.com/melix/japicmp-gradle-plugin/issues/36
8- classpath ' com.google.guava:guava:30 .1.1 -jre'
8+ classpath ' com.google.guava:guava:32 .1.2 -jre'
99 classpath ' com.github.tjni.captainhook:captain-hook:0.1.5'
1010 }
1111}
Original file line number Diff line number Diff line change @@ -93,17 +93,22 @@ dependencies {
9393
9494 api " com.github.docker-java:docker-java-api"
9595
96- shaded ' com.github.docker-java:docker-java-core'
96+ shaded(' com.github.docker-java:docker-java-core' ) {
97+ exclude group : ' com.google.guava' , module : ' guava'
98+ }
9799
98100 api ' com.github.docker-java:docker-java-transport-zerodep'
99101
102+ shaded ' com.google.guava:guava:32.1.2-jre'
100103 shaded " org.yaml:snakeyaml:1.33"
101104
102105 shaded ' org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
103106
104107 shaded ' org.zeroturnaround:zt-exec:1.12'
105108
106- testImplementation ' com.google.cloud.tools:jib-core:0.23.0'
109+ testImplementation(' com.google.cloud.tools:jib-core:0.23.0' ) {
110+ exclude group : ' com.google.guava' , module : ' guava'
111+ }
107112 testImplementation ' org.apache.httpcomponents:httpclient:4.5.9'
108113 testImplementation ' redis.clients:jedis:5.0.0'
109114 testImplementation ' com.rabbitmq:amqp-client:5.18.0'
You can’t perform that action at this time.
0 commit comments