Replace osgi.service.http packages by OSGi-bundles from Maven-Central

Part of #18
eclipse-equinox · Dec 17, 2023 · 5b7c2c0 · 5b7c2c0
1 parent f644483
commit 5b7c2c0
Show file tree

Hide file tree

Showing 33 changed files with 21 additions and 2,972 deletions.
diff --git a/bundles/org.eclipse.osgi.services/.settings/.api_filters b/bundles/org.eclipse.osgi.services/.settings/.api_filters
@@ -1,44 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.osgi.services" version="2">
-    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.cm.ConfigurationConstants">
-        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
+    <resource path="META-INF/MANIFEST.MF">
+        <filter id="926941240">
             <message_arguments>
-                <message_argument value="org.osgi.service.cm.ConfigurationConstants"/>
-                <message_argument value="CONFIGURATION_ADMIN_SPECIFICATION_VERSION"/>
-                <message_argument value="1.6.0"/>
+                <message_argument value="3.12.0"/>
+                <message_argument value="3.11.200"/>
             </message_arguments>
         </filter>
     </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.component.ComponentConstants">
-        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
+    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.http.HttpContext">
+        <filter id="305324134">
             <message_arguments>
-                <message_argument value="org.osgi.service.component.ComponentConstants"/>
-                <message_argument value="COMPONENT_SPECIFICATION_VERSION"/>
-                <message_argument value="1.4.0"/>
-            </message_arguments>
-        </filter>
-        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="403767336">
-            <message_arguments>
-                <message_argument value="org.osgi.service.component.ComponentConstants"/>
-                <message_argument value="REFERENCE_NAME_SATISFYING_CONDITION"/>
+                <message_argument value="org.osgi.service.http.HttpContext"/>
+                <message_argument value="org.eclipse.osgi.services_3.12.0"/>
             </message_arguments>
         </filter>
     </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.event.EventConstants">
-        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
+    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.http.HttpService">
+        <filter id="305324134">
             <message_arguments>
-                <message_argument value="org.osgi.service.event.EventConstants"/>
-                <message_argument value="EVENT_ADMIN_SPECIFICATION_VERSION"/>
-                <message_argument value="1.4.0"/>
+                <message_argument value="org.osgi.service.http.HttpService"/>
+                <message_argument value="org.eclipse.osgi.services_3.12.0"/>
             </message_arguments>
         </filter>
     </resource>
-    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.metatype.MetaTypeService">
-        <filter comment="Removed source files replaced by required and reexported osgi-bundles" id="388194388">
+    <resource path="META-INF/MANIFEST.MF" type="org.osgi.service.http.NamespaceException">
+        <filter id="305324134">
             <message_arguments>
-                <message_argument value="org.osgi.service.metatype.MetaTypeService"/>
-                <message_argument value="METATYPE_SPECIFICATION_VERSION"/>
-                <message_argument value="1.4.0"/>
+                <message_argument value="org.osgi.service.http.NamespaceException"/>
+                <message_argument value="org.eclipse.osgi.services_3.12.0"/>
             </message_arguments>
         </filter>
     </resource>

diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF
@@ -2,32 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %osgiServices
 Bundle-SymbolicName: org.eclipse.osgi.services
-Bundle-Version: 3.11.300.qualifier
+Bundle-Version: 3.12.0.qualifier
 Bundle-Description: %osgiServicesDes
 Bundle-Localization: plugin
 Bundle-Vendor: %eclipse.org
 Bundle-DocUrl: http://www.eclipse.org
 Bundle-ContactAddress: www.eclipse.org
 Export-Package: org.osgi.service.component.annotations;version="1.3",
- org.osgi.service.http;version="1.2.1";uses:="javax.servlet,javax.servlet.http",
- org.osgi.service.http.context;version="1.1";uses:="org.osgi.framework,javax.servlet.http",
- org.osgi.service.http.runtime;version="1.1";uses:="org.osgi.service.http.runtime.dto",
- org.osgi.service.http.runtime.dto;version="1.1";uses:="org.osgi.dto,org.osgi.framework.dto",
- org.osgi.service.http.whiteboard;version="1.1",
  org.osgi.service.log;version="1.5";uses:="org.osgi.framework";mandatory:="never.ever.use";never.ever.use="true"
-Import-Package: javax.servlet;resolution:=optional,
- javax.servlet.http;resolution:=optional,
- org.osgi.dto;version="1.0",
- org.osgi.framework;version="1.6",
- org.osgi.framework.dto;version="1.8.0",
- org.osgi.service.http;version="[1.2,1.3)",
- org.osgi.service.http.context;version="[1.1,1.2)",
- org.osgi.service.http.runtime;version="[1.1,1.2)",
- org.osgi.service.http.runtime.dto;version="[1.1,1.2)",
- org.osgi.service.http.whiteboard;version="[1.1,1.2)",
- org.osgi.service.log;version="[1.5,1.6)"
-DynamicImport-Package: javax.servlet,
- javax.servlet.http
+Import-Package: org.osgi.service.log;version="[1.5,1.6)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.osgi.services
 Require-Bundle: org.osgi.service.cm;bundle-version="[1.6.0,1.7.0)";visibility:=reexport,
@@ -38,4 +21,6 @@ Require-Bundle: org.osgi.service.cm;bundle-version="[1.6.0,1.7.0)";visibility:=r
  org.osgi.service.provisioning;bundle-version="[1.2.0,1.3.0)";visibility:=reexport,
  org.osgi.service.upnp;bundle-version="[1.2.0,1.3.0)";visibility:=reexport,
  org.osgi.service.useradmin;bundle-version="[1.1.0,1.2.0)";visibility:=reexport,
- org.osgi.service.wireadmin;bundle-version="[1.0.0,1.1.0)";visibility:=reexport
+ org.osgi.service.wireadmin;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.osgi.service.http;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.osgi.service.http.whiteboard;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/HttpContext.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/http/HttpContext.java