tightened up version compatibility for OSGi

victorlira · Apr 18, 2024 · d9954ca · d9954ca
1 parent 771d35e
commit d9954ca
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/jmail/build.gradle b/jmail/build.gradle
@@ -84,7 +84,7 @@ jar {
     manifest.attributes('Bundle-SymbolicName': 'bcjmail')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
     manifest.attributes('Export-Package': 'org.bouncycastle.mail.*')
-    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.mail.*,org.bouncycastle.*;version=\"${version}\"")
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.mail.*,org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 task sourcesJar(type: Jar) {

diff --git a/mail/build.gradle b/mail/build.gradle
@@ -64,7 +64,7 @@ jar {
     manifest.attributes('Bundle-SymbolicName': 'bcmail')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
     manifest.attributes('Export-Package': 'org.bouncycastle.mail.*')
-    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.mail.*,org.bouncycastle.*;version=\"${version}\"")
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.mail.*,org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 task sourcesJar(type: Jar) {

diff --git a/mls/build.gradle b/mls/build.gradle
@@ -161,7 +161,7 @@ jar {
     manifest.attributes('Bundle-SymbolicName': 'bcmls')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
     manifest.attributes('Export-Package': "${packages}")
-    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!${packages},org.bouncycastle.*;version=\"${version}\"")
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!${packages},org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 task sourcesJar(type: Jar) {

diff --git a/pg/build.gradle b/pg/build.gradle
@@ -72,7 +72,7 @@ jar {
     manifest.attributes('Bundle-Name': 'bcpg')
     manifest.attributes('Bundle-SymbolicName': 'bcpg')
     manifest.attributes('Export-Package': 'org.bouncycastle.{apache|bcpg|gpg|openpgp}.*')
-    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.{apache|bcpg|gpg|openpgp|}.*,org.bouncycastle.*;version=\"${version}\"")
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.{apache|bcpg|gpg|openpgp|}.*,org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 

diff --git a/pkix/build.gradle b/pkix/build.gradle
@@ -74,7 +74,7 @@ jar {
     manifest.attributes('Bundle-SymbolicName': 'bcpkix')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
     manifest.attributes('Export-Package': "${packages}")
-    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!${packages},org.bouncycastle.*;version=\"${version}\"")
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!${packages},org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 

diff --git a/tls/build.gradle b/tls/build.gradle
@@ -150,7 +150,7 @@ jar {
     manifest.attributes('Bundle-SymbolicName': 'bctls')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
     manifest.attributes('Export-Package': 'org.bouncycastle.{jsse|tls}.*')
-    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.{jsse|tls}.*,org.bouncycastle.*;version=\"${version}\"")
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.{jsse|tls}.*,org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 

diff --git a/util/build.gradle b/util/build.gradle
@@ -70,7 +70,7 @@ jar {
     manifest.attributes('Bundle-SymbolicName': 'bcutil')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
     manifest.attributes('Export-Package': "${packages},org.bouncycastle.oer.*")
-    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!${packages},!org.bouncycastle.oer.*,org.bouncycastle.*;version=\"${version}\"")
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!${packages},!org.bouncycastle.oer.*,org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }