Test migration support and runner against 4.12 and 4.13

Author: marcphilipp

buildSrc/src/main/kotlin/junit4-compatibility.gradle.kts

@@ -0,0 +1,33 @@
+plugins {
+	`java-library`
+}
+
+val junit_4_12 by configurations.creating {
+	extendsFrom(configurations.testRuntimeClasspath.get())
+}
+
+dependencies {
+	constraints {
+		api("junit:junit:[${Versions.junit4Min},)") {
+			version {
+				prefer(Versions.junit4)
+			}
+		}
+	}
+	junit_4_12("junit:junit") {
+		version {
+			strictly("4.12")
+		}
+	}
+	testRuntimeOnly("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.12_1")
+}
+
+tasks {
+	val test_4_12 by registering(Test::class) {
+		classpath -= configurations.testRuntimeClasspath.get()
+		classpath += junit_4_12
+	}
+	check {
+		dependsOn(test_4_12)
+	}
+}

junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts

@@ -2,6 +2,7 @@ import aQute.bnd.gradle.BundleTaskConvention;
 
 plugins {
 	`java-library-conventions`
+	`junit4-compatibility`
 }
 
 apply(from = "$rootDir/gradle/testing.gradle.kts")
@@ -11,11 +12,7 @@ description = "JUnit Jupiter Migration Support"
 dependencies {
 	api(platform(project(":junit-bom")))
 
-	api("junit:junit:[${Versions.junit4Min},)") {
-		version {
-			prefer(Versions.junit4)
-		}
-	}
+	api("junit:junit")
 	api("org.apiguardian:apiguardian-api:${Versions.apiGuardian}")
 
 	api(project(":junit-jupiter-api"))
@@ -24,8 +21,6 @@ dependencies {
 	testImplementation(project(":junit-platform-launcher"))
 	testImplementation(project(":junit-platform-runner"))
 	testImplementation(project(":junit-platform-testkit"))
-
-	testRuntimeOnly("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.12_1")
 }
 
 tasks.jar {

junit-platform-runner/junit-platform-runner.gradle.kts

@@ -2,6 +2,7 @@ import aQute.bnd.gradle.BundleTaskConvention;
 
 plugins {
 	`java-library-conventions`
+	`junit4-compatibility`
 }
 
 apply(from = "$rootDir/gradle/testing.gradle.kts")
@@ -11,17 +12,12 @@ description = "JUnit Platform Runner"
 dependencies {
 	api(platform(project(":junit-bom")))
 
-	api("junit:junit:[${Versions.junit4Min},)") {
-		version {
-			prefer(Versions.junit4)
-		}
-	}
+	api("junit:junit")
 	api("org.apiguardian:apiguardian-api:${Versions.apiGuardian}")
 
 	api(project(":junit-platform-launcher"))
 	api(project(":junit-platform-suite-api"))
 
-	testRuntimeOnly("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.12_1")
 	testImplementation(testFixtures(project(":junit-platform-engine")))
 	testImplementation(testFixtures(project(":junit-platform-launcher")))
 }

junit-vintage-engine/junit-vintage-engine.gradle.kts

@@ -2,48 +2,23 @@ import aQute.bnd.gradle.BundleTaskConvention;
 
 plugins {
 	`java-library-conventions`
+	`junit4-compatibility`
 }
 
 apply(from = "$rootDir/gradle/testing.gradle.kts")
 
 description = "JUnit Vintage Engine"
 
-val junit_4_12 by configurations.creating {
-	extendsFrom(configurations.testRuntimeClasspath.get())
-}
-
 dependencies {
 	api(platform(project(":junit-bom")))
 
 	api("org.apiguardian:apiguardian-api:${Versions.apiGuardian}")
 	api(project(":junit-platform-engine"))
-	api("junit:junit:[${Versions.junit4Min},)") {
-		version {
-			prefer(Versions.junit4)
-		}
-	}
+	api("junit:junit")
 
 	testImplementation(project(":junit-platform-launcher"))
 	testImplementation(project(":junit-platform-runner"))
 	testImplementation(project(":junit-platform-testkit"))
-
-	junit_4_12("junit:junit") {
-		version {
-			strictly("4.12")
-		}
-	}
-
-	testRuntimeOnly("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.12_1")
-}
-
-tasks {
-	val test_4_12 by registering(Test::class) {
-		classpath -= configurations.testRuntimeClasspath.get()
-		classpath += junit_4_12
-	}
-	check {
-		dependsOn(test_4_12)
-	}
 }
 
 tasks.jar {