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

Merge branch '3.4.x' 

Closes gh-43870
This commit is contained in:
Andy Wilkinson 2025-01-17 16:23:56 +00:00
parent 96d90eb63d 86818b0e45
commit 239a6e8901
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -89,6 +89,7 @@ final class JavaPluginAction implements PluginApplicationAction {
project.afterEvaluate(this::configureUtf8Encoding);
configureParametersCompilerArg(project);
configureAdditionalMetadataLocations(project);
configureSpringBootStarterTestToDependOnJUnitPlatformLauncher(project);
}
private void classifyJarTask(Project project) {
@ -317,6 +318,15 @@ final class JavaPluginAction implements PluginApplicationAction {
testImplementation.extendsFrom(testAndDevelopmentOnly);
}
private void configureSpringBootStarterTestToDependOnJUnitPlatformLauncher(Project project) {
project.getDependencies()
.components((components) -> components.withModule("org.springframework.boot:spring-boot-starter-test",
(metadata) -> metadata.withVariant("runtimeElements", (variant) -> variant.withDependencies(
(dependencies) -> dependencies.add("org.junit.platform:junit-platform-launcher")
))));
}
/**
* Task {@link Action} to add additional meta-data locations. We need to use an
* inner-class rather than a lambda due to