diff --git a/build.gradle b/build.gradle index a4d39a8a355..db09456caad 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ plugins { id 'de.undercouch.download' version '4.1.1' id "io.freefair.aspectj" version '5.1.1' apply false id "com.github.ben-manes.versions" version '0.28.0' + id "com.github.johnrengelman.shadow" version "6.1.0" apply false id "me.champeau.gradle.jmh" version "0.5.2" apply false id "org.jetbrains.kotlin.plugin.serialization" version "1.4.21" apply false } diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index 6c72e4daccd..9672530e832 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -1,15 +1,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -plugins { - id "com.github.johnrengelman.shadow" version "5.2.0" -} - description = "Spring Core" apply plugin: "kotlin" // spring-core includes asm and repackages cglib, inlining both into the spring-core jar. -// cglib itself depends on asm and is therefore further transformed by the JarJar task to +// cglib itself depends on asm and is therefore further transformed by the ShadowJar task to // depend on org.springframework.asm; this avoids including two different copies of asm. def cglibVersion = "3.3.0" def objenesisVersion = "3.1"