Include junit-platform-launcher in Gradle builds

Closes gh-1476
spring-io · May 8, 2024 · 14a4a25 · 14a4a25
1 parent c2c4223
commit 14a4a25
Show file tree

Hide file tree

Showing 33 changed files with 43 additions and 0 deletions.
diff --git a/...java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java b/...java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java
@@ -20,6 +20,8 @@
 import io.spring.initializr.generator.buildsystem.Dependency;
 import io.spring.initializr.generator.buildsystem.Dependency.Exclusion;
 import io.spring.initializr.generator.buildsystem.DependencyScope;
+import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
+import io.spring.initializr.generator.condition.ConditionalOnBuildSystem;
 import io.spring.initializr.generator.condition.ConditionalOnPackaging;
 import io.spring.initializr.generator.condition.ConditionalOnPlatformVersion;
 import io.spring.initializr.generator.packaging.war.WarPackaging;
@@ -35,6 +37,7 @@
  *
  * @author Andy Wilkinson
  * @author Jean-Baptiste Nizet
+ * @author Moritz Halbritter
  */
 @ProjectGenerationConfiguration
 public class BuildProjectGenerationConfiguration {
@@ -57,6 +60,14 @@ public BuildCustomizer<Build> junitJupiterTestStarterContributor() {
 				.scope(DependencyScope.TEST_COMPILE));
 	}
 
+	@Bean
+	@ConditionalOnBuildSystem(GradleBuildSystem.ID)
+	BuildCustomizer<Build> junitLauncherContributor() {
+		return (build) -> build.dependencies()
+			.add("junit-launcher", Dependency.withCoordinates("org.junit.platform", "junit-platform-launcher")
+				.scope(DependencyScope.TEST_RUNTIME));
+	}
+
 	@Bean
 	public DefaultStarterBuildCustomizer defaultStarterContributor(InitializrMetadata metadata) {
 		return new DefaultStarterBuildCustomizer(metadata);

diff --git a/...nitializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java b/...nitializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java
@@ -135,6 +135,7 @@ void buildDotGradleDotKtsIsContributedWhenGeneratingGradleKtsProject() {
 				"    implementation(\"org.springframework.boot:spring-boot-starter\")",
 				"    implementation(\"com.example:acme\")",
 				"    testImplementation(\"org.springframework.boot:spring-boot-starter-test\")",
+				"    testRuntimeOnly(\"org.junit.platform:junit-platform-launcher\")",
 				"}",
 				"",
 				"tasks.withType<Test> {",

diff --git a/...g/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java b/...g/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java
@@ -133,6 +133,7 @@ void buildDotGradleIsContributedWhenGeneratingGradleProject() {
 				"    implementation 'org.springframework.boot:spring-boot-starter'",
 				"    implementation 'com.example:acme'",
 				"    testImplementation 'org.springframework.boot:spring-boot-starter-test'",
+				"    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'",
 				"}",
 				"",
 				"tasks.named('test') {",

diff --git a/...spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen b/...spring/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen
@@ -26,6 +26,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/...ng/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen b/...ng/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.kts.gen
@@ -26,6 +26,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.gen
@@ -18,6 +18,7 @@ repositories {
 dependencies {
 	implementation 'org.acme:foo'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 dependencyManagement {

diff --git a/...lizr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen b/...lizr-generator-spring/src/test/resources/project/gradle/bom-ordering-build.gradle.kts.gen
@@ -18,6 +18,7 @@ repositories {
 dependencies {
 	implementation("org.acme:foo")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 dependencyManagement {

diff --git a/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.gen
@@ -22,6 +22,7 @@ ext {
 dependencies {
 	implementation 'org.acme:foo'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 dependencyManagement {

diff --git a/...lizr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen b/...lizr-generator-spring/src/test/resources/project/gradle/bom-property-build.gradle.kts.gen
@@ -20,6 +20,7 @@ extra["fooVersion"] = "1.3.3"
 dependencies {
 	implementation("org.acme:foo")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 dependencyManagement {

diff --git a/...nerator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen b/...nerator-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen
@@ -20,6 +20,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	compileOnly 'org.acme:foo'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/...tor-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen b/...tor-spring/src/test/resources/project/gradle/compile-only-dependency-build.gradle.kts.gen
@@ -20,6 +20,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	compileOnly("org.acme:foo")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen
@@ -22,6 +22,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.withType(KotlinCompile) {

diff --git a/...izr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen b/...izr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen
@@ -22,6 +22,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter")
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<KotlinCompile> {

diff --git a/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.gen
@@ -21,6 +21,7 @@ dependencies {
 	implementation 'org.acme:bar'
 	implementation 'org.acme:foo'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/...lizr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen b/...lizr-generator-spring/src/test/resources/project/gradle/repositories-build.gradle.kts.gen
@@ -21,6 +21,7 @@ dependencies {
 	implementation("org.acme:bar")
 	implementation("org.acme:foo")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/...enerator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen b/...enerator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen
@@ -19,6 +19,7 @@ repositories {
 dependencies {
 	implementation 'org.acme:foo'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/...ator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen b/...ator-spring/src/test/resources/project/gradle/repositories-milestone-build.gradle.kts.gen
@@ -19,6 +19,7 @@ repositories {
 dependencies {
 	implementation("org.acme:foo")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/...lizr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen b/...lizr-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.gen
@@ -23,6 +23,7 @@ ext {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/...-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen b/...-generator-spring/src/test/resources/project/gradle/version-override-build.gradle.kts.gen
@@ -21,6 +21,7 @@ extra["spring-foo.version"] = "0.1.0.RELEASE"
 dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.gen
@@ -19,6 +19,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
 	implementation 'org.apache.groovy:groovy'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/groovy/next/build.gradle.kts.gen
@@ -19,6 +19,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter")
 	implementation("org.apache.groovy:groovy")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.gen
@@ -19,6 +19,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
 	implementation 'org.codehaus.groovy:groovy'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/build.gradle.kts.gen
@@ -19,6 +19,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter")
 	implementation("org.codehaus.groovy:groovy")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.gen
@@ -21,6 +21,7 @@ dependencies {
 	implementation 'org.codehaus.groovy:groovy'
 	providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/...lizr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen b/...lizr-generator-spring/src/test/resources/project/groovy/standard/war-build.gradle.kts.gen
@@ -21,6 +21,7 @@ dependencies {
 	implementation("org.codehaus.groovy:groovy")
 	providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.gen
@@ -18,6 +18,7 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/java/standard/build.gradle.kts.gen
@@ -18,6 +18,7 @@ repositories {
 dependencies {
 	implementation("org.springframework.boot:spring-boot-starter")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.gen
@@ -20,6 +20,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {

diff --git a/...ializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen b/...ializr-generator-spring/src/test/resources/project/java/standard/war-build.gradle.kts.gen
@@ -20,6 +20,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<Test> {

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen
@@ -22,6 +22,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.withType(KotlinCompile) {

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen
@@ -22,6 +22,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter")
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<KotlinCompile> {

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen
@@ -24,6 +24,7 @@ dependencies {
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
 	providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.withType(KotlinCompile) {

diff --git a/...lizr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen b/...lizr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen
@@ -24,6 +24,7 @@ dependencies {
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.withType<KotlinCompile> {