Fix OSGi crypt manifest entries (#1506)

mongodb · Sep 23, 2024 · 49f7eb4 · 49f7eb4
1 parent a138393
commit 49f7eb4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/driver-core/build.gradle b/driver-core/build.gradle
@@ -89,7 +89,7 @@ afterEvaluate {
             'com.github.luben.zstd.*;resolution:=optional',
             'org.slf4j.*;resolution:=optional',
             'jnr.unixsocket.*;resolution:=optional',
-            'com.mongodb.crypt.capi.*;resolution:=optional',
+            'com.mongodb.internal.crypt.capi.*;resolution:=optional',
             'jdk.net.*;resolution:=optional', // Used by SocketStreamHelper & depends on JDK version
             'org.bson.codecs.record.*;resolution:=optional', // Depends on JDK version
             'org.bson.codecs.kotlin.*;resolution:=optional',

diff --git a/driver-reactive-streams/build.gradle b/driver-reactive-streams/build.gradle
@@ -75,6 +75,7 @@ afterEvaluate {
     jar.manifest.attributes['Bundle-SymbolicName'] = 'org.mongodb.driver-reactivestreams'
     jar.manifest.attributes['Import-Package'] = [
             'com.mongodb.crypt.capi.*;resolution:=optional',
+            'com.mongodb.internal.crypt.capi.*;resolution:=optional',
             '*',
     ].join(',')
 }
diff --git a/driver-sync/build.gradle b/driver-sync/build.gradle
@@ -49,6 +49,7 @@ afterEvaluate {
     jar.manifest.attributes['Bundle-SymbolicName'] = 'org.mongodb.driver-sync'
     jar.manifest.attributes['Import-Package'] = [
             'com.mongodb.crypt.capi.*;resolution:=optional',
+            'com.mongodb.internal.crypt.capi.*;resolution:=optional',
             '*',
     ].join(',')
 }
diff --git a/mongodb-crypt/build.gradle.kts b/mongodb-crypt/build.gradle.kts
@@ -175,7 +175,7 @@ afterEvaluate {
     tasks.jar {
         manifest {
             attributes(
-                "-exportcontents" to "com.mongodb.crypt.capi.*;-noimport:=true",
+                "-exportcontents" to "com.mongodb.*;-noimport:=true",
                 "Automatic-Module-Name" to "com.mongodb.crypt.capi",
                 "Import-Package" to "org.slf4j.*;resolution:=optional,org.bson.*",
                 "Bundle-Name" to "MongoCrypt",