Replace Require-Bundle for org.eclipse.osgi.service with Import-Package for affected packages (#5)

Author: erik-brangs

core/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF

@@ -39,6 +39,10 @@ Export-Package: org.eclipse.wst.sse.core,
  org.eclipse.wst.sse.core.text,
  org.eclipse.wst.sse.core.utils,
  org.eclipse.wst.sse.internal.contentproperties;x-friends:="org.eclipse.wst.dtd.core,org.eclipse.wst.dtd.ui,org.eclipse.wst.sse.ui,org.eclipse.wst.xml.core,org.eclipse.wst.xml.ui,org.eclipse.wst.xsd.core,org.eclipse.wst.xsd.ui"
+Import-Package: org.eclipse.osgi.util,
+ org.osgi.service.event,
+ org.osgi.service.prefs,
+ org.osgi.framework
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.text;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.jobs;bundle-version="[3.13.0,4.0.0)",
@@ -49,7 +53,6 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.2.700,2.0.0)";resolution:=optional,
  org.eclipse.core.filesystem;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.6.100,4.0.0)",
- org.eclipse.osgi.services;bundle-version="[3.11.0,4.0.0)",
  com.ibm.icu;bundle-version="73.1.0"
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.wst.sse.core.internal.propertytester"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF

@@ -44,7 +44,11 @@ Export-Package: org.eclipse.jst.jsp.core.internal;x-friends:="org.eclipse.jst.js
  org.eclipse.jst.jsp.css.core.internal.parserz;x-internal:=true
 Import-Package: javax.servlet.jsp.tagext;version="[2.0.0,3.0.0)",
  org.w3c.dom.css,
- org.w3c.dom.stylesheets
+ org.w3c.dom.stylesheets,
+ org.eclipse.osgi.util,
+ org.osgi.service.event,
+ org.osgi.service.prefs,
+ org.osgi.framework
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.jobs;bundle-version="[3.10.0,4.0.0)",
@@ -58,7 +62,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.28.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)",
  com.ibm.icu;bundle-version="73.1.0",
- org.eclipse.osgi.services;bundle-version="[3.7.0,4.0.0]",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.300,2.0.0)";resolution:=optional,
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
  org.eclipse.tips.core;resolution:=optional

xml/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF

@@ -308,6 +308,11 @@ Export-Package: org.eclipse.wst.xml.core.contentmodel.modelquery,
    org.eclipse.wst.xsd.core,
    org.eclipse.wst.xsd.ui",
  org.eclipse.wst.xml.core.text
+Import-Package: org.eclipse.osgi.service.datalocation,
+ org.eclipse.osgi.util,
+ org.osgi.service.event,
+ org.osgi.service.prefs,
+ org.osgi.framework
 Require-Bundle: org.apache.xerces;bundle-version="[2.12.2,3.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
@@ -320,8 +325,7 @@ Require-Bundle: org.apache.xerces;bundle-version="[2.12.2,3.0.0)";visibility:=re
  org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";resolution:=optional,
  org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
  org.eclipse.wst.common.core;bundle-version="[1.2.0,2.0.0)",
- com.ibm.icu;bundle-version="73.1.0",
- org.eclipse.osgi.services;bundle-version="[3.7.0,4.0.0)"
+ com.ibm.icu;bundle-version="73.1.0"
 Bundle-ActivationPolicy: lazy; exclude:="org.eclipse.wst.xml.core.internal.contenttype"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.wst.xml.core