Make jdk.jfr import optional in OSGi manifest (#5092)

For consistency with its module descriptor.

---------

Co-authored-by: Marc Philipp <[email protected]>
(cherry picked from commit 729fc28)

Author: laeubi

documentation/src/docs/asciidoc/release-notes/release-notes-6.0.1.adoc

@@ -16,6 +16,8 @@ repository on GitHub.
 [[release-notes-6.0.1-junit-platform-bug-fixes]]
 ==== Bug Fixes
 
+* The `jdk.jfr` package is now an optional import when using the `junit-platform-launcher`
+  as an OSGi bundle.
 * Remove remnants of Java 8 compatibility from User Guide.
 
 [[release-notes-6.0.1-junit-platform-deprecations-and-breaking-changes]]

gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts

@@ -16,6 +16,7 @@ tasks.withType<Jar>().named {
 
 	val importAPIGuardian by extra { "org.apiguardian.*;resolution:=\"optional\"" }
 	val importJSpecify by extra { "org.jspecify.*;resolution:=\"optional\"" }
+	val importCommonsLogging by extra { "org.junit.platform.commons.logging;status=INTERNAL" }
 
 	extensions.create<BundleTaskExtension>(BundleTaskExtension.NAME, this).apply {
 		properties.set(projectDescription.map {
@@ -38,15 +39,15 @@ tasks.withType<Jar>().named {
 				Import-Package: \
 					${importAPIGuardian},\
 					${importJSpecify},\
-					org.junit.platform.commons.logging;status=INTERNAL,\
+					${importCommonsLogging},\
 					kotlin.*;resolution:="optional",\
 					*
 
 				# This tells bnd not to complain if a module doesn't actually import
 				# the kotlin and apiguardian packages, but enough modules do to make it a default.
 				-fixupmessages.kotlin.import: "Unused Import-Package instructions: \\[kotlin.*\\]";is:=ignore
 				-fixupmessages.apiguardian.import: "Unused Import-Package instructions: \\[org.apiguardian.*\\]";is:=ignore
-				-fixupmessages.jspecify.import: "Unused Import-Package instructions: \\[org.jspecify.*\\]";is:=ignore
+				-fixupmessages.warningsAsErrors: ".*";restrict:=warning;is:=error
 
 				# Don't scan for Class.forName package imports.
 				# See https://bnd.bndtools.org/instructions/noclassforname.html
@@ -86,10 +87,10 @@ val osgiProperties by tasks.registering(WriteProperties::class) {
 		property("-runee", Callable { "JavaSE-${javaLibrary.mainJavaVersion.get()}" })
 	}
 	property("-runrequires", "osgi.identity;filter:='(osgi.identity=${project.name})'")
-	property("-runsystempackages", "jdk.internal.misc,jdk.jfr,sun.misc")
-	// API Guardian should be optional -> instruct resolver to ignore it
+	property("-runsystempackages", "jdk.internal.misc,sun.misc")
+	// API Guardian and JDK JFR should be optional -> instruct resolver to ignore them
 	// during resolution. Resolve should still pass.
-	property("-runblacklist", "org.apiguardian.api")
+	property("-runblacklist", "org.apiguardian.api,jdk.jfr")
 }
 
 val osgiVerification = configurations.dependencyScope("osgiVerification")

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

@@ -26,13 +26,14 @@ tasks {
 		bundle {
 			val importAPIGuardian: String by extra
 			val importJSpecify: String by extra
+			val importCommonsLogging: String by extra
 			bnd("""
 				# Import JUnit4 packages with a version
 				Import-Package: \
 					$importAPIGuardian,\
 					$importJSpecify,\
+					$importCommonsLogging,\
 					org.junit;version="[${libs.versions.junit4Min.get()},5)",\
-					org.junit.platform.commons.logging;status=INTERNAL,\
 					org.junit.rules;version="[${libs.versions.junit4Min.get()},5)",\
 					*
 			""")

junit-platform-launcher/junit-platform-launcher.gradle.kts

@@ -23,8 +23,17 @@ javadocConventions {
 tasks {
 	jar {
 		bundle {
+			val importAPIGuardian: String by extra
+			val importJSpecify: String by extra
+			val importCommonsLogging: String by extra
 			val version = project.version
 			bnd("""
+				Import-Package: \
+					${importAPIGuardian},\
+					${importJSpecify},\
+					${importCommonsLogging},\
+					jdk.jfr;resolution:="optional",\
+					*
 				Provide-Capability:\
 					org.junit.platform.launcher;\
 						org.junit.platform.launcher='junit-platform-launcher';\

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

@@ -48,16 +48,17 @@ tasks {
 			val version = project.version
 			val importAPIGuardian: String by extra
 			val importJSpecify: String by extra
+			val importCommonsLogging: String by extra
 			bnd("""
 				# Import JUnit4 packages with a version
 				Import-Package: \
 					${importAPIGuardian},\
 					${importJSpecify},\
+					${importCommonsLogging},\
 					junit.runner;version="[${junit4Min},5)",\
 					org.junit;version="[${junit4Min},5)",\
 					org.junit.experimental.categories;version="[${junit4Min},5)",\
 					org.junit.internal.builders;version="[${junit4Min},5)",\
-					org.junit.platform.commons.logging;status=INTERNAL,\
 					org.junit.runner.*;version="[${junit4Min},5)",\
 					org.junit.runners.model;version="[${junit4Min},5)",\
 					*