tightened up version compatibility for OSGi

dghgit · dghgit · commit d9954ca0d95f · 2024-04-18T13:54:25.000+10:00
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})\"")
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ jar {`
`84`	`84`	`manifest.attributes('Bundle-SymbolicName': 'bcjmail')`
`85`	`85`	`manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')`
`86`	`86`	`manifest.attributes('Export-Package': 'org.bouncycastle.mail.*')`
`87`		`- manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!org.bouncycastle.mail.,org.bouncycastle.;version=\"${version}\"")`
	`87`	`+ manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!org.bouncycastle.mail.,org.bouncycastle.;version=\"[${version},${maxVersion})\"")`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`task sourcesJar(type: Jar) {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ jar {`
`64`	`64`	`manifest.attributes('Bundle-SymbolicName': 'bcmail')`
`65`	`65`	`manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')`
`66`	`66`	`manifest.attributes('Export-Package': 'org.bouncycastle.mail.*')`
`67`		`- manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!org.bouncycastle.mail.,org.bouncycastle.;version=\"${version}\"")`
	`67`	`+ manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!org.bouncycastle.mail.,org.bouncycastle.;version=\"[${version},${maxVersion})\"")`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`task sourcesJar(type: Jar) {`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ jar {`
`161`	`161`	`manifest.attributes('Bundle-SymbolicName': 'bcmls')`
`162`	`162`	`manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')`
`163`	`163`	`manifest.attributes('Export-Package': "${packages}")`
`164`		`- manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!${packages},org.bouncycastle.*;version=\"${version}\"")`
	`164`	`+ manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!${packages},org.bouncycastle.*;version=\"[${version},${maxVersion})\"")`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`task sourcesJar(type: Jar) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ jar {`
`72`	`72`	`manifest.attributes('Bundle-Name': 'bcpg')`
`73`	`73`	`manifest.attributes('Bundle-SymbolicName': 'bcpg')`
`74`	`74`	`manifest.attributes('Export-Package': 'org.bouncycastle.{apache\|bcpg\|gpg\|openpgp}.*')`
`75`		`- manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!org.bouncycastle.{apache\|bcpg\|gpg\|openpgp\|}.,org.bouncycastle.;version=\"${version}\"")`
	`75`	`+ manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!org.bouncycastle.{apache\|bcpg\|gpg\|openpgp\|}.,org.bouncycastle.;version=\"[${version},${maxVersion})\"")`
`76`	`76`	`}`
`77`	`77`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ jar {`
`74`	`74`	`manifest.attributes('Bundle-SymbolicName': 'bcpkix')`
`75`	`75`	`manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')`
`76`	`76`	`manifest.attributes('Export-Package': "${packages}")`
`77`		`- manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!${packages},org.bouncycastle.*;version=\"${version}\"")`
	`77`	`+ manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!${packages},org.bouncycastle.*;version=\"[${version},${maxVersion})\"")`
`78`	`78`	`}`
`79`	`79`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ jar {`
`150`	`150`	`manifest.attributes('Bundle-SymbolicName': 'bctls')`
`151`	`151`	`manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')`
`152`	`152`	`manifest.attributes('Export-Package': 'org.bouncycastle.{jsse\|tls}.*')`
`153`		`- manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!org.bouncycastle.{jsse\|tls}.,org.bouncycastle.;version=\"${version}\"")`
	`153`	`+ manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!org.bouncycastle.{jsse\|tls}.,org.bouncycastle.;version=\"[${version},${maxVersion})\"")`
`154`	`154`	`}`
`155`	`155`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ jar {`
`70`	`70`	`manifest.attributes('Bundle-SymbolicName': 'bcutil')`
`71`	`71`	`manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')`
`72`	`72`	`manifest.attributes('Export-Package': "${packages},org.bouncycastle.oer.*")`
`73`		`- manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!${packages},!org.bouncycastle.oer.,org.bouncycastle.;version=\"${version}\"")`
	`73`	`+ manifest.attributes('Import-Package': "java.;resolution:=optional,javax.;resolution:=optional,!${packages},!org.bouncycastle.oer.,org.bouncycastle.;version=\"[${version},${maxVersion})\"")`
`74`	`74`	`}`
`75`	`75`
`76`	`76`