[build] Ensure that the Import-Package headers are exactly as before …

…the JDK11-related changes
ops4j · Jul 6, 2023 · bcb7470 · bcb7470
1 parent 4244d66
commit bcb7470
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 14 deletions.
diff --git a/pax-url-aether/osgi.bnd b/pax-url-aether/osgi.bnd
@@ -16,7 +16,7 @@ Import-Package:\
   javax.net.ssl,\
   javax.xml.parsers,\
   org.osgi.framework;version="[1.5,2)",\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   org.osgi.service.annotation*; resolution:=optional,\
   org.osgi.util.tracker;version="[1.4,2)",\
   !javax.servlet*,\

diff --git a/pax-url-cache/osgi.bnd b/pax-url-cache/osgi.bnd
@@ -11,7 +11,8 @@ Export-Service:\
   org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=cache
 
 Import-Package:\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.framework;version="[1.6,2)",\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   !org.slf4j.impl,\
   *
 

diff --git a/pax-url-classpath/osgi.bnd b/pax-url-classpath/osgi.bnd
@@ -11,7 +11,8 @@ Export-Service:\
   org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=classpath
 
 Import-Package:\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.framework;version="[1.6,2)",\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   !org.slf4j.impl,\
   *
 

diff --git a/pax-url-commons/osgi.bnd b/pax-url-commons/osgi.bnd
@@ -5,7 +5,8 @@ Bundle-SymbolicName:\
   ${bundle.symbolicName}  
 
 Import-Package:\
-  org.osgi.service.cm;resolution:=optional,\
+  org.osgi.framework;version="[1.6,2)",\
+  org.osgi.service.cm;version="[1.4,2)";resolution:=optional,\
   *
 
 -removeheaders:\

diff --git a/pax-url-dir/osgi.bnd b/pax-url-dir/osgi.bnd
@@ -11,7 +11,7 @@ Export-Service:\
   org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=dir
 
 Import-Package:\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   aQute.service.scripting; resolution:=optional,\
   javax.xml.parsers; resolution:=optional,\
   org.osgi.service.log; resolution:=optional,\

diff --git a/pax-url-link/osgi.bnd b/pax-url-link/osgi.bnd
@@ -11,7 +11,8 @@ Export-Service:\
   org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=link
 
 Import-Package:\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.framework;version="[1.6,2)",\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   !org.slf4j.impl,\
   *
 

diff --git a/pax-url-obr/osgi-uber.bnd b/pax-url-obr/osgi-uber.bnd
@@ -11,8 +11,9 @@ Export-Service:\
   org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=obr
 
 Import-Package:\
+  org.osgi.framework;version="[1.6,2)",\
   org.osgi.service.obr; version="0.0.0",\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   *
 
 Export-Package:\

diff --git a/pax-url-obr/osgi.bnd b/pax-url-obr/osgi.bnd
@@ -11,8 +11,9 @@ Export-Service:\
   org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=obr
 
 Import-Package:\
+  org.osgi.framework;version="[1.6,2)",\
   org.osgi.service.obr; version="0.0.0",\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   *
 
 Export-Package:\

diff --git a/pax-url-reference/osgi.bnd b/pax-url-reference/osgi.bnd
@@ -11,6 +11,7 @@ Export-Service:\
   org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=reference
 
 Import-Package:\
+  org.osgi.framework;version="[1.6,2)",\
   !org.slf4j.impl,\
   *
 

diff --git a/pax-url-war/osgi-uber.bnd b/pax-url-war/osgi-uber.bnd
@@ -14,8 +14,8 @@ Export-Service:\
   org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=webbundle
 
 Import-Package:\
-  org.osgi.service.component.annotations; resolution:=optional,\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.service.component.annotations;version="[1.2,2)"; resolution:=optional,\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   org.osgi.service.repository; resolution:=optional,\
   org.osgi.framework;version="[1.6,2)",\
   org.osgi.util.function;version="[1.1,2)",\

diff --git a/pax-url-war/osgi.bnd b/pax-url-war/osgi.bnd
@@ -22,7 +22,7 @@ Import-Package:\
   org.osgi.service.log; resolution:=optional,\
   org.w3c.dom; resolution:=optional,\
   org.xml.sax; resolution:=optional,\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   org.osgi.service.repository; resolution:=optional,\
   org.osgi.framework;version="[1.6,2)",\
   org.osgi.util.function;version="[1.1,2)",\

diff --git a/pax-url-wrap/osgi-uber.bnd b/pax-url-wrap/osgi-uber.bnd
@@ -11,8 +11,8 @@ Export-Service:\
   org.osgi.service.url.URLStreamHandlerService; url.handler.protocol=wrap
 
 Import-Package:\
-  org.osgi.service.component.annotations; resolution:=optional,\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.service.component.annotations;version="[1.2,2)"; resolution:=optional,\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   org.osgi.framework;version="[1.6,2)",\
   !aQute.bnd,\
   *

diff --git a/pax-url-wrap/osgi.bnd b/pax-url-wrap/osgi.bnd
@@ -20,7 +20,7 @@ Import-Package:\
   org.osgi.service.log; resolution:=optional,\
   org.w3c.dom; resolution:=optional,\
   org.xml.sax; resolution:=optional,\
-  org.osgi.service.cm; resolution:=optional,\
+  org.osgi.service.cm;version="[1.4,2)"; resolution:=optional,\
   !org.slf4j.impl,\
   *