fix the version imports of the jstl library: 1.2.0; not 2.5.0; remove the imports of packages that belong to the jdk5 and more

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1375 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Hugues Malphettes 2010-03-10 06:39:19 +00:00
parent fb1befb69d
commit 11a5d3674e
2 changed files with 17 additions and 24 deletions

View File

@ -6,14 +6,14 @@ Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jsp;singleton:=true
Bundle-Version: 7.0.2.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.mortbay.jetty.jsp-2.1-glassfish,
org.mortbay.jetty.jsp-api-2.1-glassfish
Import-Package: javax.el;version="2.1",
javax.servlet.jsp;version="2.1",
javax.servlet.jsp.el;version="2.1",
javax.servlet.jsp.jstl.core;version="2.1",
javax.servlet.jsp.jstl.fmt;version="2.1",
javax.servlet.jsp.jstl.sql;version="2.1",
javax.servlet.jsp.jstl.tlv;version="2.1",
Require-Bundle: org.mortbay.jetty.jsp-2.1-glassfish
Import-Package: javax.el;version="1.0.0";resolution:=optional,
javax.servlet.jsp;version="2.1.0",
javax.servlet.jsp.el;version="2.1.0",
javax.servlet.jsp.jstl.core;version="1.2.0";resolution:=optional,
javax.servlet.jsp.jstl.fmt;version="1.2.0";resolution:=optional,
javax.servlet.jsp.jstl.sql;version="1.2.0";resolution:=optional,
javax.servlet.jsp.jstl.tlv;version="1.2.0";resolution:=optional,
javax.servlet.jsp.resources;version="2.1",
javax.servlet.jsp.tagext;version="2.1"
javax.servlet.jsp.tagext;version="2.1",
javax.servlet.resources;version="2.5.0"

View File

@ -5,19 +5,13 @@ Bundle-SymbolicName: org.eclipse.jetty.osgi.boot;singleton:=true
Bundle-Vendor: Mort Bay Consulting
Bundle-Version: 7.0.2.qualifier
Bundle-Activator: org.eclipse.jetty.osgi.boot.JettyBootstrapActivator
Import-Package: javax.mail;resolution:=optional,
javax.mail.event;resolution:=optional,
javax.mail.internet;resolution:=optional,
javax.mail.search;resolution:=optional,
javax.mail.util;resolution:=optional,
javax.naming;resolution:=optional,
javax.naming.directory;resolution:=optional,
javax.security.auth;resolution:=optional,
javax.security.auth.callback;resolution:=optional,
javax.security.auth.login;resolution:=optional,
javax.security.auth.spi;resolution:=optional,
javax.servlet,
javax.servlet.http,
Import-Package: javax.mail;version="1.4.0";resolution:=optional,
javax.mail.event;version="1.4.0";resolution:=optional,
javax.mail.internet;version="1.4.0";resolution:=optional,
javax.mail.search;version="1.4.0";resolution:=optional,
javax.mail.util;version="1.4.0";resolution:=optional,
javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
javax.transaction;version="1.1.0";resolution:=optional,
javax.transaction.xa;version="1.1.0";resolution:=optional,
org.osgi.framework,
@ -26,7 +20,6 @@ Import-Package: javax.mail;resolution:=optional,
org.osgi.service.startlevel;version="1.0",
org.osgi.service.url;version="1.0.0",
org.osgi.util.tracker;version="1.3.0",
org.xml.sax,
org.slf4j;resolution:=optional,
org.slf4j.spi;resolution:=optional,
org.slf4j.helpers;resolution:=optional