Upgrade to Maven Shade Plugin 3.5.0

Closes gh-36752
pull/36767/head
Andy Wilkinson 1 year ago
parent 1368593199
commit 579aac055d

@ -131,7 +131,7 @@ bom {
] ]
} }
} }
library("Maven Shade Plugin", "3.2.4") { library("Maven Shade Plugin", "3.5.0") {
group("org.apache.maven.plugins") { group("org.apache.maven.plugins") {
modules = [ modules = [
"maven-shade-plugin" "maven-shade-plugin"

@ -15,11 +15,6 @@ configurations {
dependencies { dependencies {
compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations") compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations")
compileOnly("org.sonatype.plexus:plexus-build-api") compileOnly("org.sonatype.plexus:plexus-build-api")
compileOnly("org.apache.maven.shared:maven-common-artifact-filters") {
exclude(group: "javax.annotation", module: "javax.annotation-api")
exclude(group: "javax.enterprise", module: "cdi-api")
exclude(group: "javax.inject", module: "javax.inject")
}
compileOnly("org.apache.maven:maven-core") { compileOnly("org.apache.maven:maven-core") {
exclude(group: "javax.annotation", module: "javax.annotation-api") exclude(group: "javax.annotation", module: "javax.annotation-api")
exclude(group: "javax.inject", module: "javax.inject") exclude(group: "javax.inject", module: "javax.inject")
@ -30,9 +25,14 @@ dependencies {
exclude(group: "javax.inject", module: "javax.inject") exclude(group: "javax.inject", module: "javax.inject")
} }
implementation("org.springframework:spring-context")
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform")) implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")) implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
implementation("org.apache.maven.shared:maven-common-artifact-filters") {
exclude(group: "javax.annotation", module: "javax.annotation-api")
exclude(group: "javax.enterprise", module: "cdi-api")
exclude(group: "javax.inject", module: "javax.inject")
}
implementation("org.springframework:spring-context")
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform")) intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")) intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
@ -58,6 +58,15 @@ dependencies {
runtimeOnly("org.sonatype.plexus:plexus-build-api") runtimeOnly("org.sonatype.plexus:plexus-build-api")
testImplementation("org.apache.maven:maven-core") {
exclude(group: "javax.annotation", module: "javax.annotation-api")
exclude(group: "javax.inject", module: "javax.inject")
}
testImplementation("org.apache.maven.shared:maven-common-artifact-filters") {
exclude(group: "javax.annotation", module: "javax.annotation-api")
exclude(group: "javax.enterprise", module: "cdi-api")
exclude(group: "javax.inject", module: "javax.inject")
}
testImplementation("org.assertj:assertj-core") testImplementation("org.assertj:assertj-core")
testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.mockito:mockito-core") testImplementation("org.mockito:mockito-core")

Loading…
Cancel
Save