Use Import-Package without version instead of DynamicImport-Package

Author: jack-berg

api/all/build.gradle.kts

@@ -9,10 +9,10 @@ plugins {
 description = "OpenTelemetry API"
 otelJava.moduleName.set("io.opentelemetry.api")
 base.archivesName.set("opentelemetry-api")
-// These packages are accessed via Class.forName and cannot be added as compileOnly dependencies
-// (api:incubator depends on api:all, creating a circular dependency). Use DynamicImport-Package
-// so OSGi does not require them at resolution time but can wire them at runtime when available.
-otelJava.osgiDynamicImportPackages.set(listOf("io.opentelemetry.sdk.autoconfigure", "io.opentelemetry.api.incubator", "io.opentelemetry.api.incubator.internal"))
+// These packages cannot be compileOnly dependencies (api:incubator depends on api:all, creating a
+// circular dependency; sdk:autoconfigure is in a different module family). Declare them as optional
+// imports without a version constraint so OSGi wires them if present but does not require them.
+otelJava.osgiUnversionedOptionalPackages.set(listOf("io.opentelemetry.sdk.autoconfigure", "io.opentelemetry.api.incubator", "io.opentelemetry.api.incubator.internal"))
 
 dependencies {
   api(project(":context"))

buildSrc/src/main/kotlin/io/opentelemetry/gradle/OtelJavaExtension.kt

@@ -18,18 +18,17 @@ abstract class OtelJavaExtension {
 
     abstract val osgiOptionalPackages: ListProperty<String>
 
-    // Packages accessed via Class.forName that are not on the compile classpath (e.g. due to
-    // circular dependencies). These are excluded from Import-Package and added to
-    // DynamicImport-Package so OSGi does not require them at resolution time, but can still wire
-    // them at runtime when available.
-    abstract val osgiDynamicImportPackages: ListProperty<String>
+    // Packages that should be optional imports but are not on the compile classpath (e.g. due to
+    // circular dependencies), so BND cannot resolve version="${@}" for them. Added to Import-Package
+    // with resolution:=optional but no version constraint.
+    abstract val osgiUnversionedOptionalPackages: ListProperty<String>
 
     abstract val minJavaVersionSupported: Property<JavaVersion>
 
     init {
         minJavaVersionSupported.convention(JavaVersion.VERSION_1_8)
         osgiEnabled.convention(true)
         osgiOptionalPackages.convention(emptyList<String>())
-        osgiDynamicImportPackages.convention(emptyList<String>())
+        osgiUnversionedOptionalPackages.convention(emptyList<String>())
     }
 }

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -145,24 +145,20 @@ tasks {
           optionalPackages.addAll(otelJava.osgiOptionalPackages.get())
           val importPackages = optionalPackages.joinToString(",") { "$it.*;resolution:=optional;version=\"\${@}\"" } + ",*"
 
-          // Packages accessed via Class.forName that are not on the compile classpath cannot be made
-          // optional via Import-Package (BND cannot resolve version="${@}" for them). Instead, exclude
-          // them from Import-Package and declare them as DynamicImport-Package so OSGi does not
-          // require them at resolution time but can still wire them at runtime when available.
-          val dynamicImportPackages = otelJava.osgiDynamicImportPackages.get()
-          val negations = dynamicImportPackages.joinToString(",") { "!$it" }
-          val fullImportPackages = if (negations.isNotEmpty()) "$negations,$importPackages" else importPackages
-
-          val bndInstructions = mutableMapOf(
+          // Packages not on the compile classpath (e.g. due to circular dependencies) cannot use
+          // version="${@}" since BND cannot resolve the version. Add them as optional imports without
+          // a version constraint; they are listed before the wildcard so BND uses our explicit
+          // instruction rather than auto-detecting them with a version.
+          val unversionedOptionalPackages = otelJava.osgiUnversionedOptionalPackages.get()
+          val unversionedImports = unversionedOptionalPackages.joinToString(",") { "$it.*;resolution:=optional" }
+          val fullImportPackages = if (unversionedImports.isNotEmpty()) "$unversionedImports,$importPackages" else importPackages
+
+          bnd(mapOf(
             // Exclude shaded internal packages from exports; they are implementation details and
             // should not be part of the OSGi bundle's public API surface.
             "-exportcontents" to "!io.opentelemetry.internal.shaded.*,io.opentelemetry.*",
             "Import-Package" to fullImportPackages
-          )
-          if (dynamicImportPackages.isNotEmpty()) {
-            bndInstructions["DynamicImport-Package"] = dynamicImportPackages.joinToString(",") { "$it.*" }
-          }
-          bnd(bndInstructions)
+          ))
         }
       }
     }