Polish OSGi build checks

- Run verifyOSGi later (as part of check)
- Use custom osgiVerification configuration instead of
  testRuntimeClasspath
- Rename verifyOSGiProperties task to osgiProperties

Author: marcphilipp

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

@@ -19,7 +19,9 @@ dependencies {
 			strictly("4.12")
 		}
 	}
-	testRuntimeOnly("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.12_1")
+	pluginManager.withPlugin("osgi-conventions") {
+		"osgiVerification"("org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.12_1")
+	}
 }
 
 tasks {

buildSrc/src/main/kotlin/osgi-conventions.gradle.kts

@@ -61,41 +61,49 @@ tasks.withType<Jar>().matching {
 		// Do the actual work putting OSGi stuff in the jar.
 		btc.buildBundle()
 	}
-
-	finalizedBy("verifyOSGi")
 }
 
+val osgiPropertiesFile = file("$buildDir/verifyOSGiProperties.bndrun")
+
 // Bnd's Resolve task uses a properties file for it's configuration. This
 // task writes out the properties necessary for it to verify the OSGi
 // metadata.
-tasks.register<WriteProperties>("verifyOSGiProperties") {
-	setOutputFile("${buildDir}/verifyOSGiProperties.bndrun")
-	property("-standalone", "true")
+val osgiProperties by tasks.registering(WriteProperties::class) {
+	outputFile = osgiPropertiesFile
+	property("-standalone", true)
 	property("-runee", "JavaSE-${Versions.jvmTarget}")
 	property("-runrequires", "osgi.identity;filter:='(osgi.identity=${project.name})'")
 	property("-runsystempackages", "jdk.internal.misc,sun.misc")
 }
 
+val osgiVerification by configurations.creating {
+	extendsFrom(configurations.runtimeClasspath.get())
+}
+
 // Bnd's Resolve task is what verifies that a jar can be used in OSGi and
 // that it's metadata is valid. If the metadata is invalid this task will
 // fail.
-tasks.register<Resolve>("verifyOSGi") {
-	dependsOn("verifyOSGiProperties")
-	setBndrun("${buildDir}/verifyOSGiProperties.bndrun")
+val verifyOSGi by tasks.registering(Resolve::class) {
+	dependsOn(osgiProperties)
+	setBndrun(osgiPropertiesFile)
 	isReportOptional = false
 	withConvention(FileSetRepositoryConvention::class) {
 
 		// By default bnd will use jars found in:
 		// 1. project.sourceSets.main.runtimeClasspath
 		// 2. project.configurations.archives.artifacts.files
 		// to validate the metadata.
-		// This adds jars defined in `testRuntimeClasses` also so that bnd
+		// This adds jars defined in `osgiVerification` also so that bnd
 		// can use them to validate the metadata without causing those to
 		// end up in the dependencies of those projects.
-		bundles(sourceSets["test"].runtimeClasspath)
+		bundles(osgiVerification)
 	}
 }
 
+tasks.check {
+	dependsOn(verifyOSGi)
+}
+
 // The ${project.description}, for some odd reason, is only available
 // afterEvaluate.
 afterEvaluate {

junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts

@@ -79,7 +79,7 @@ tasks {
 	// (org.junit.platform.console.ConsoleLauncherToolProvider which implements
 	// java.util.spi.ToolProvider which is @since 9).
 	// So in order to resolve this, it can only run on Java 9
-	verifyOSGiProperties {
+	osgiProperties {
 		property("-runee", "JavaSE-9")
 	}
 }

junit-platform-console/junit-platform-console.gradle.kts

@@ -47,7 +47,7 @@ tasks {
 	// (org.junit.platform.console.ConsoleLauncherToolProvider which implements
 	// java.util.spi.ToolProvider which is @since 9).
 	// So in order to resolve this, it can only run on Java 9
-	verifyOSGiProperties {
+	osgiProperties {
 		property("-runee", "JavaSE-9")
 	}
 }

junit-platform-suite-api/junit-platform-suite-api.gradle.kts

@@ -9,5 +9,5 @@ dependencies {
 
 	api("org.apiguardian:apiguardian-api:${Versions.apiGuardian}")
 
-	testRuntimeOnly(project(":junit-platform-commons"))
+	osgiVerification(project(":junit-platform-commons"))
 }