Bug 302480 - Any plug-in that provides Servlet/JSP/EL libs newer than platform's Orbit bundles can result in a LinkageError
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
index 4b9e723..2e18ca7 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
@@ -12,10 +12,7 @@
org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)",
- javax.servlet;bundle-version="[2.4.0,3.0.0)",
- javax.servlet.jsp;bundle-version="[2.0.0,3.0.0)",
- org.apache.commons.el;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-ManifestVersion: 2
Export-Package: org.eclipse.jst.pagedesigner.jsp.core;x-internal:=true,
@@ -25,3 +22,12 @@
org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter;x-internal:=true,
org.eclipse.jst.pagedesigner.jsp.core.util;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: javax.servlet;version="2.4.0",
+ javax.servlet.http;version="2.4.0",
+ javax.servlet.jsp;version="2.0.0",
+ javax.servlet.jsp.el;version="2.0.0",
+ javax.servlet.jsp.resources;version="2.0.0",
+ javax.servlet.jsp.tagext;version="2.0.0",
+ javax.servlet.resources;version="2.4.0",
+ org.apache.commons.el;version="1.0.0",
+ org.apache.commons.el.parser;version="1.0.0"
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
index 7e2f202..f26fc3c 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
@@ -31,9 +31,6 @@
org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.2.0)",
org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- javax.servlet;bundle-version="[2.4.0,3.0.0)",
- org.apache.commons.el;bundle-version="[1.0.0,2.0.0)",
- javax.servlet.jsp;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui.views.properties.tabbed;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,3.5.0]"
Bundle-ActivationPolicy: lazy
@@ -123,6 +120,15 @@
org.eclipse.jst.pagedesigner.validation.caret;x-internal:=true,
org.eclipse.jst.pagedesigner.viewer;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: javax.servlet;version="2.4.0",
+ javax.servlet.http;version="2.4.0",
+ javax.servlet.jsp;version="2.0.0",
+ javax.servlet.jsp.el;version="2.0.0",
+ javax.servlet.jsp.resources;version="2.0.0",
+ javax.servlet.jsp.tagext;version="2.0.0",
+ javax.servlet.resources;version="2.4.0",
+ org.apache.commons.el;version="1.0.0",
+ org.apache.commons.el.parser;version="1.0.0"
