Skip to content

Commit 579aac0

Browse files
committed
Upgrade to Maven Shade Plugin 3.5.0
Closes gh-36752
1 parent 1368593 commit 579aac0

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

spring-boot-project/spring-boot-parent/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ bom {
131131
]
132132
}
133133
}
134-
library("Maven Shade Plugin", "3.2.4") {
134+
library("Maven Shade Plugin", "3.5.0") {
135135
group("org.apache.maven.plugins") {
136136
modules = [
137137
"maven-shade-plugin"

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

+15-6
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ configurations {
1515
dependencies {
1616
compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations")
1717
compileOnly("org.sonatype.plexus:plexus-build-api")
18-
compileOnly("org.apache.maven.shared:maven-common-artifact-filters") {
19-
exclude(group: "javax.annotation", module: "javax.annotation-api")
20-
exclude(group: "javax.enterprise", module: "cdi-api")
21-
exclude(group: "javax.inject", module: "javax.inject")
22-
}
2318
compileOnly("org.apache.maven:maven-core") {
2419
exclude(group: "javax.annotation", module: "javax.annotation-api")
2520
exclude(group: "javax.inject", module: "javax.inject")
@@ -30,9 +25,14 @@ dependencies {
3025
exclude(group: "javax.inject", module: "javax.inject")
3126
}
3227

33-
implementation("org.springframework:spring-context")
3428
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
3529
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
30+
implementation("org.apache.maven.shared:maven-common-artifact-filters") {
31+
exclude(group: "javax.annotation", module: "javax.annotation-api")
32+
exclude(group: "javax.enterprise", module: "cdi-api")
33+
exclude(group: "javax.inject", module: "javax.inject")
34+
}
35+
implementation("org.springframework:spring-context")
3636

3737
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
3838
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
@@ -58,6 +58,15 @@ dependencies {
5858

5959
runtimeOnly("org.sonatype.plexus:plexus-build-api")
6060

61+
testImplementation("org.apache.maven:maven-core") {
62+
exclude(group: "javax.annotation", module: "javax.annotation-api")
63+
exclude(group: "javax.inject", module: "javax.inject")
64+
}
65+
testImplementation("org.apache.maven.shared:maven-common-artifact-filters") {
66+
exclude(group: "javax.annotation", module: "javax.annotation-api")
67+
exclude(group: "javax.enterprise", module: "cdi-api")
68+
exclude(group: "javax.inject", module: "javax.inject")
69+
}
6170
testImplementation("org.assertj:assertj-core")
6271
testImplementation("org.junit.jupiter:junit-jupiter")
6372
testImplementation("org.mockito:mockito-core")

0 commit comments

Comments
 (0)