From 49f7eb43b5ea9f9d7f2fb434d80956f489180606 Mon Sep 17 00:00:00 2001
From: Valentin Kovalenko <valentin.kovalenko@mongodb.com>
Date: Mon, 23 Sep 2024 15:27:19 -0600
Subject: [PATCH] Fix OSGi crypt manifest entries (#1506)

---
 driver-core/build.gradle             | 2 +-
 driver-reactive-streams/build.gradle | 1 +
 driver-sync/build.gradle             | 1 +
 mongodb-crypt/build.gradle.kts       | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/driver-core/build.gradle b/driver-core/build.gradle
index 72cd74104f5..c23a24a9fb8 100644
--- 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
index 5a08997e6e8..7b86f010484 100644
--- 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
index eb10ef62ebf..1c2f3ac6c59 100644
--- 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
index bf2fef544ff..6c07a315185 100644
--- 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",