From bcb7470b9e80bb1eacc22e1ee726f984f601a8bc Mon Sep 17 00:00:00 2001 From: Grzegorz Grzybek Date: Thu, 6 Jul 2023 09:37:58 +0200 Subject: [PATCH] [build] Ensure that the Import-Package headers are exactly as before the JDK11-related changes --- pax-url-aether/osgi.bnd | 2 +- pax-url-cache/osgi.bnd | 3 ++- pax-url-classpath/osgi.bnd | 3 ++- pax-url-commons/osgi.bnd | 3 ++- pax-url-dir/osgi.bnd | 2 +- pax-url-link/osgi.bnd | 3 ++- pax-url-obr/osgi-uber.bnd | 3 ++- pax-url-obr/osgi.bnd | 3 ++- pax-url-reference/osgi.bnd | 1 + pax-url-war/osgi-uber.bnd | 4 ++-- pax-url-war/osgi.bnd | 2 +- pax-url-wrap/osgi-uber.bnd | 4 ++-- pax-url-wrap/osgi.bnd | 2 +- 13 files changed, 21 insertions(+), 14 deletions(-) diff --git a/pax-url-aether/osgi.bnd b/pax-url-aether/osgi.bnd index 4f5c3907f..46eb22f5c 100644 --- 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 index 86434c993..a2dbc96a0 100644 --- 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 index 485b2bce3..fbe258240 100644 --- 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 index 9ae52933a..9266610b0 100644 --- 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 index cbf337744..3aa57a9f8 100644 --- 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 index 640b78ee2..868a19e62 100644 --- 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 index 68f0519a8..dd01e160a 100644 --- 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 index d72af9714..6b461fc0a 100644 --- 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 index d978f357d..a30c3d512 100644 --- 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 index 7f0580181..3754de41a 100644 --- 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 index 6d8bc5a2e..e1e632f67 100644 --- 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 index 2a07ccecb..a89fa7193 100644 --- 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 index e8894bdec..751a8b470 100644 --- 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,\ *