Fix OSGi :mongodb-crypt manifest entries
#1506
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jyemin
approved these changes
Sep 23, 2024
| @@ -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', | |||
There was a problem hiding this comment.
driver-core doesn't reference MongoCryptException (the only class left in this package), so this needed to be removed or else we get a warning.
| @@ -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', | |||
There was a problem hiding this comment.
reactive-streams (and sync) reference MongoCryptException, and also the classes that were moved into the internal package, so both packages are now needed.
| @@ -175,7 +175,7 @@ afterEvaluate { | |||
| tasks.jar { | |||
| manifest { | |||
| attributes( | |||
| "-exportcontents" to "com.mongodb.crypt.capi.*;-noimport:=true", | |||
| "-exportcontents" to "com.mongodb.*;-noimport:=true", | |||
There was a problem hiding this comment.
This is a weird one. driver-core uses * for this, but * causes a warning with mongodb-crypt because the jar file contains directories for each of the shared library files, and some of those (e.g. linux-aarch64) are not valid Java package names. Using com.mongodb.* does the trick (it could also just be com.*).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.