Browse Source

Switch Maven plugin to exclude optional dependencies by default

Closes gh-47318
pull/47334/head
Phillip Webb 4 months ago
parent
commit
d27aedf92a
  1. 4
      build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java
  2. 4
      build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java

4
build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java

@ -181,14 +181,14 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests { @@ -181,14 +181,14 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
}
@TestTemplate
void whenAnEntryIsOptionalByDefaultAppearsInTheRepackagedJar(MavenBuild mavenBuild) {
void whenAnEntryIsOptionalByDefaultDoesNotAppearInTheRepackagedJar(MavenBuild mavenBuild) {
mavenBuild.project("jar-optional-default").goals("install").execute((project) -> {
File repackaged = new File(project, "target/jar-optional-default-0.0.1.BUILD-SNAPSHOT.jar");
assertThat(jar(repackaged)).hasEntryWithNameStartingWith("BOOT-INF/classes/")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-jcl")
.hasEntryWithNameStartingWith("BOOT-INF/lib/log4j-api-");
.doesNotHaveEntryWithNameStartingWith("BOOT-INF/lib/log4j-api-");
});
}

4
build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java

@ -124,8 +124,8 @@ public abstract class AbstractPackagerMojo extends AbstractDependencyFilterMojo @@ -124,8 +124,8 @@ public abstract class AbstractPackagerMojo extends AbstractDependencyFilterMojo
* Include JAR tools.
* @since 3.3.0
*/
@Parameter(defaultValue = "true")
public boolean includeTools = true;
@Parameter(defaultValue = "false")
public boolean includeTools;
/**
* Layer configuration with options to disable layer creation, exclude layer tools

Loading…
Cancel
Save