diff --git a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF index 34402990d49..67fa7679d2a 100644 --- a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF @@ -11,16 +11,15 @@ Export-Package: org.eclipse.equinox.http.servlet;version="1.2.0", org.eclipse.equinox.http.servlet.context;version="1.0.0";x-internal:=true, org.eclipse.equinox.http.servlet.session;version="1.0.0";x-internal:=true, org.eclipse.equinox.http.servlet.dto;version="1.0.0";x-internal:=true -Import-Package: org.apache.commons.fileupload;version="[1.2.2, 2.0.0)";resolution:=optional, - org.apache.commons.fileupload.disk;version="[1.2.2, 2.0.0)";resolution:=optional, - org.apache.commons.fileupload.servlet;version="[1.2.2, 2.0.0)";resolution:=optional, - javax.servlet;version="[3.1.0,5.0.0)", - javax.servlet.annotation;version="[3.1.0,5.0.0)";resolution:=optional, - javax.servlet.descriptor;version="[3.1.0,5.0.0)";resolution:=optional, +Import-Package: javax.servlet;version="[3.1.0,5.0.0)", + javax.servlet.descriptor;version="[3.1.0,5.0.0)", javax.servlet.http;version="[3.1.0,5.0.0)", + org.apache.commons.fileupload;version="[1.2.2,2.0.0)";resolution:=optional, + org.apache.commons.fileupload.disk;version="[1.2.2,2.0.0)";resolution:=optional, + org.apache.commons.fileupload.servlet;version="[1.2.2,2.0.0)";resolution:=optional, org.osgi.dto;version="[1.0.0,2.0)", org.osgi.framework;version="[1.3.0,2.0)", - org.osgi.framework.dto; version="[1.8.0,2.0)", + org.osgi.framework.dto;version="[1.8.0,2.0)", org.osgi.framework.wiring;version="[1.1.0,2.0)", org.osgi.service.http;version="[1.2,1.3)", org.osgi.service.http.context;version="[1.1,1.2)", diff --git a/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF index a399d0779eb..062d6ef5caf 100644 --- a/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF @@ -6,11 +6,9 @@ Bundle-SymbolicName: org.eclipse.equinox.http.servletbridge;singleton:=true Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.eclipse.equinox.http.servletbridge.internal.Activator Bundle-Localization: plugin -Import-Package: javax.servlet;version="2.3", - javax.servlet.http;version="2.3", +Import-Package: javax.servlet.http;version="2.3", org.eclipse.equinox.http.servlet;version="1.0.0", org.eclipse.equinox.servletbridge;version="1.0.0", - org.osgi.framework;version="1.3.0", - org.osgi.service.http;version="1.2.0" + org.osgi.framework;version="1.3.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.equinox.http.servletbridge diff --git a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF index 3aac969861d..bdf918721b1 100644 --- a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF @@ -8,13 +8,10 @@ Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator Import-Package: com.sun.el;version="3.0.0", javax.servlet;version="[2.4,5.0)", - javax.servlet.annotation;version="[2.6,5.0)";resolution:=optional, - javax.servlet.descriptor;version="[2.6,5.0)";resolution:=optional, + javax.servlet.descriptor;version="[2.6.0,5.0.0)", javax.servlet.http;version="[2.4,5.0)", - javax.servlet.jsp;version="[2.0,3.0)", org.apache.jasper.servlet;version="[9,10)", org.osgi.framework;version="1.3.0", - org.osgi.service.http;version="1.2.0", org.osgi.service.packageadmin;version="1.2.0", org.osgi.util.tracker;version="1.3.1" Export-Package: org.eclipse.equinox.jsp.jasper;version="1.0.0"