diff --git a/build.gradle b/build.gradle index 0a71ca1e..fcc49713 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ apply plugin: 'com.palantir.baseline-java-versions' dependencies { implementation localGroovy() implementation gradleApi() - implementation 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow' + implementation 'gradle.plugin.com.github.johnrengelman:shadow' implementation 'com.google.guava:guava' annotationProcessor 'org.immutables:value' diff --git a/src/main/groovy/com/palantir/gradle/shadowjar/ShadowJarConfigurationTask.java b/src/main/groovy/com/palantir/gradle/shadowjar/ShadowJarConfigurationTask.java index 807a0eef..eb9777f1 100644 --- a/src/main/groovy/com/palantir/gradle/shadowjar/ShadowJarConfigurationTask.java +++ b/src/main/groovy/com/palantir/gradle/shadowjar/ShadowJarConfigurationTask.java @@ -34,7 +34,6 @@ import java.util.stream.Stream; import java.util.zip.ZipEntry; import org.gradle.api.DefaultTask; -import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.ResolvedDependency; import org.gradle.api.file.FileCollection; import org.gradle.api.provider.Property; @@ -75,7 +74,7 @@ public final Property getPrefix() { } @Classpath - public final List getConfigurations() { + public final List getConfigurations() { return shadowJarProperty.get().getConfigurations(); } diff --git a/versions.lock b/versions.lock index 3ea2674f..5b75d8d5 100644 --- a/versions.lock +++ b/versions.lock @@ -5,23 +5,21 @@ com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) com.google.guava:guava:31.0.1-jre (1 constraints: a5065053) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0) -com.gradle.publish:plugin-publish-plugin:0.14.0 (1 constraints: 8317e148) -commons-io:commons-io:2.11.0 (2 constraints: 8d1c29bf) -gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0 (1 constraints: 09050e36) -org.apache.ant:ant:1.10.9 (1 constraints: 8917e448) -org.apache.ant:ant-launcher:1.10.9 (1 constraints: 9908a68d) +commons-io:commons-io:2.11.0 (2 constraints: a118e1a4) +gradle.plugin.com.github.johnrengelman:shadow:7.1.2 (1 constraints: 0c051336) +org.apache.ant:ant:1.10.11 (1 constraints: 9c13d15e) +org.apache.ant:ant-launcher:1.10.11 (1 constraints: c2086096) org.apache.logging.log4j:log4j-api:2.17.1 (1 constraints: be0e2676) -org.apache.logging.log4j:log4j-core:2.17.1 (1 constraints: 8617ee48) -org.apache.maven:maven-model:3.0.4 (1 constraints: 491159d2) +org.apache.logging.log4j:log4j-core:2.17.1 (1 constraints: 7313504b) org.checkerframework:checker-qual:3.12.0 (2 constraints: 500f4e96) -org.codehaus.plexus:plexus-utils:3.3.0 (1 constraints: 54176931) +org.codehaus.plexus:plexus-utils:3.4.1 (1 constraints: 4013dc37) org.immutables:value:2.8.8 (1 constraints: 14051536) -org.jdom:jdom2:2.0.6 (1 constraints: 56176131) -org.ow2.asm:asm:9.1 (4 constraints: 4c36ef2f) -org.ow2.asm:asm-analysis:9.1 (1 constraints: e509dea5) -org.ow2.asm:asm-commons:9.1 (1 constraints: fa160103) -org.ow2.asm:asm-tree:9.1 (2 constraints: 31146e8c) -org.vafer:jdependency:2.6.0 (1 constraints: 56176d31) +org.jdom:jdom2:2.0.6 (1 constraints: 4013d037) +org.ow2.asm:asm:9.2 (4 constraints: 393231c3) +org.ow2.asm:asm-analysis:9.2 (1 constraints: e609dfa5) +org.ow2.asm:asm-commons:9.2 (1 constraints: e5129d11) +org.ow2.asm:asm-tree:9.2 (2 constraints: 33148e8c) +org.vafer:jdependency:2.7.0 (1 constraints: 4113df37) [Test dependencies] cglib:cglib-nodep:3.3.0 (2 constraints: 7a1acf3c) diff --git a/versions.props b/versions.props index e460acad..de1a502c 100644 --- a/versions.props +++ b/versions.props @@ -1,4 +1,4 @@ -gradle.plugin.com.github.jengelman.gradle.plugins:shadow = 7.0.0 +gradle.plugin.com.github.johnrengelman:shadow = 7.1.2 org.immutables:value = 2.8.8 com.google.guava:guava = 31.0.1-jre org.apache.logging.log4j:* = 2.17.1