Skip to content

Commit 2a62939

Browse files
committed
Polish "Make excludes configurable via property"
See gh-39837
1 parent 58fc8f8 commit 2a62939

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void whenAnEntryIsExcludedItDoesNotAppearInTheRepackagedJar(MavenBuild mavenBuil
175175
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context")
176176
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core")
177177
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-jcl")
178-
.doesNotHaveEntryWithNameStartingWith("BOOT-INF/lib/jakarta.servlet-api-");
178+
.doesNotHaveEntryWithName("BOOT-INF/lib/servlet-api-2.5.jar");
179179
});
180180
}
181181

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,10 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo {
8181

8282
/**
8383
* Collection of artifact definitions to exclude. The {@link Exclude} element defines
84-
* mandatory {@code groupId} and {@code artifactId} properties and an optional
85-
* {@code classifier} property. If passing in excludes as a property the syntax is
86-
* <pre>-Dspring-boot.excludes=groupId1:artifactId1,groupId2:artifactId2:optional-qualifier</pre>
84+
* mandatory {@code groupId} and {@code artifactId} components and an optional
85+
* {@code classifier} component. When configured as a property, values should be
86+
* comma-separated with colon-separated components:
87+
* {@code groupId:artifactId,groupId:artifactId:classifier}
8788
* @since 1.1.0
8889
*/
8990
@Parameter(property = "spring-boot.excludes")

0 commit comments

Comments
 (0)