root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix Maven Plugin tests on main 

See gh-47318
See gh-47319
This commit is contained in:
Andy Wilkinson 2025-09-25 08:47:39 +01:00
parent 27715dee20
commit 7979a51f65
8 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build-plugin/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java
View File

@ -187,7 +187,6 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
assertThat(jar(repackaged)).hasEntryWithNameStartingWith("BOOT-INF/classes/") assertThat(jar(repackaged)).hasEntryWithNameStartingWith("BOOT-INF/classes/")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context") .hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core") .hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-jcl")
.doesNotHaveEntryWithNameStartingWith("BOOT-INF/lib/log4j-api-"); .doesNotHaveEntryWithNameStartingWith("BOOT-INF/lib/log4j-api-");
}); });
} }
@ -199,7 +198,6 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
assertThat(jar(repackaged)).hasEntryWithNameStartingWith("BOOT-INF/classes/") assertThat(jar(repackaged)).hasEntryWithNameStartingWith("BOOT-INF/classes/")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context") .hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core") .hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-jcl")
.hasEntryWithNameStartingWith("BOOT-INF/lib/log4j-api-"); .hasEntryWithNameStartingWith("BOOT-INF/lib/log4j-api-");
}); });
} }
@ -211,7 +209,6 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
assertThat(jar(repackaged)).hasEntryWithNameStartingWith("BOOT-INF/classes/") assertThat(jar(repackaged)).hasEntryWithNameStartingWith("BOOT-INF/classes/")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context") .hasEntryWithNameStartingWith("BOOT-INF/lib/spring-context")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core") .hasEntryWithNameStartingWith("BOOT-INF/lib/spring-core")
.hasEntryWithNameStartingWith("BOOT-INF/lib/spring-jcl")
.doesNotHaveEntryWithNameStartingWith("BOOT-INF/lib/log4j-api-"); .doesNotHaveEntryWithNameStartingWith("BOOT-INF/lib/log4j-api-");
}); });
} }

0
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-optional-default/pom.xml → build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-optional-default/pom.xml
View File

0
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-optional-default/src/main/java/org/test/SampleApplication.java → build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-optional-default/src/main/java/org/test/SampleApplication.java
View File

0
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-optional-exclude/pom.xml → build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-optional-exclude/pom.xml
View File

0
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-optional-exclude/src/main/java/org/test/SampleApplication.java → build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-optional-exclude/src/main/java/org/test/SampleApplication.java
View File

0
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-optional-include/pom.xml → build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-optional-include/pom.xml
View File

0
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-optional-include/src/main/java/org/test/SampleApplication.java → build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-optional-include/src/main/java/org/test/SampleApplication.java
View File

8
build-plugin/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractPackagerMojo.java
View File

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