Make jdk.jfr import optional in OSGi manifest

Co-authored-by: laeubi <[email protected]>

Author: 2 people

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 importJdkJfr by extra { "jdk.jfr;resolution:=\"optional\"" }
 
 	extensions.create<BundleTaskExtension>(BundleTaskExtension.NAME, this).apply {
 		properties.set(projectDescription.map {
@@ -38,6 +39,7 @@ tasks.withType<Jar>().named {
 				Import-Package: \
 					${importAPIGuardian},\
 					${importJSpecify},\
+					${importJdkJfr},\
 					org.junit.platform.commons.logging;status=INTERNAL,\
 					kotlin.*;resolution:="optional",\
 					*
@@ -47,6 +49,7 @@ tasks.withType<Jar>().named {
 				-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.jdkjfr.import: "Unused Import-Package instructions: \\[jdk.jfr\\]";is:=ignore
 
 				# Don't scan for Class.forName package imports.
 				# See https://bnd.bndtools.org/instructions/noclassforname.html
@@ -86,8 +89,8 @@ 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")
 }