From d27aedf92ada80060770bd405ae666e6825e4f63 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 24 Sep 2025 16:34:19 -0700 Subject: [PATCH] Switch Maven plugin to exclude optional dependencies by default Closes gh-47318 --- .../org/springframework/boot/maven/JarIntegrationTests.java | 4 ++-- .../org/springframework/boot/maven/AbstractPackagerMojo.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java b/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java index 71fb557b43a..10e8a20e480 100644 --- a/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java +++ b/build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java @@ -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-"); }); } diff --git a/build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java b/build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java index e80ab4737bd..f16fa7d490a 100644 --- a/build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java +++ b/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 * 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