Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6

This commit is contained in:
hmalphettes 2011-12-02 17:27:26 +08:00
parent 24ccaec3da
commit 89afbdf31d
24 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -1,4 +1,5 @@
jetty-8.1.0-SNAPSHOT
+ 360245 The version of the javax.servlet packages to import is 2.6 instead of 3.0
jetty-8.1.0.RC0 - 30 November 2011
+ 352565 cookie httponly flag ignored

5
jetty-aggregate/jetty-all-server/pom.xml
View File

@ -75,10 +75,9 @@
<instructions>
<Import-Package>
!org.eclipse.jetty*,
com.sun.org.apache.commons.logging;version="[2.1,3)";split="glassfish";resolution:=optional,
javax.annotation;version="1.0.0";resolution:=optional,
javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
javax.servlet;version="2.6.0",
javax.servlet.http;version="2.6.0",
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,

5
jetty-ajp/pom.xml
View File

@ -21,6 +21,11 @@
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

2
jetty-annotations/pom.xml
View File

@ -42,7 +42,7 @@
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="3.0",*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package>
</instructions>
</configuration>
</execution>

2
jetty-continuation/pom.xml
View File

@ -24,7 +24,7 @@
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="[2.5,3.1)",org.mortbay.log.*;version="[6.1,7)";resolution:=optional,org.mortbay.util.ajax.*;version="[6.1,7)";resolution:=optional,*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",org.mortbay.log.*;version="[6.1,7)";resolution:=optional,org.mortbay.util.ajax.*;version="[6.1,7)";resolution:=optional,*</Import-Package>
</instructions>
</configuration>
</execution>

2
jetty-deploy/pom.xml
View File

@ -24,7 +24,7 @@
</goals>
<configuration>
<instructions>
<Import-Package>org.eclipse.jetty.jmx.*;version="[7.3,8)";resolution:=optional,*</Import-Package>
<Import-Package>org.eclipse.jetty.jmx.*;version="8.0";resolution:=optional,*</Import-Package>
</instructions>
</configuration>
</execution>

2
jetty-http/pom.xml
View File

@ -42,7 +42,7 @@
</goals>
<configuration>
<instructions>
<Import-Package>javax.net.*,*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",javax.net.*,*</Import-Package>
</instructions>
</configuration>
</execution>

5
jetty-jaspi/pom.xml
View File

@ -22,6 +22,11 @@
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

2
jetty-nested/pom.xml
View File

@ -26,7 +26,7 @@
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet*;version="2.5.0",*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package>
</instructions>
</configuration>
</execution>

2
jetty-nosql/pom.xml
View File

@ -28,7 +28,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="2.5.0",org.eclipse.jetty.server.session.jmx;version="8.0.0";resolution:=optional,,org.eclipse.jetty.*;version="8.0.0",*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",org.eclipse.jetty.server.session.jmx;version="8.0.0";resolution:=optional,,org.eclipse.jetty.*;version="8.0.0",*</Import-Package>
</instructions>
</configuration>
<extensions>true</extensions>

4
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
View File

@ -10,8 +10,8 @@ Import-Package: javax.mail;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="3.0",
javax.servlet.http;version="3.0",
javax.servlet;version="2.6",
javax.servlet.http;version="2.6",
javax.transaction;version="1.1.0";resolution:=optional,
javax.transaction.xa;version="1.1.0";resolution:=optional,
org.eclipse.jetty.nested;version="8.0.0";resolution:=optional,

4
jetty-osgi/jetty-osgi-boot/pom.xml
View File

@ -117,8 +117,8 @@
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.servlet;version="2.6.0",
javax.servlet.http;version="2.6.0",
javax.transaction;version="1.1.0";resolution:=optional,
javax.transaction.xa;version="1.1.0";resolution:=optional,
org.eclipse.jetty.nested;version="8.0.0";resolution:=optional,

13
jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
View File

@ -6,12 +6,11 @@ Bundle-Version: 8.0.0.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Jetty-ContextFilePath: contexts/httpservice.xml
Import-Package: javax.servlet;version="3.0",
javax.servlet.http;version="3.0",
Import-Package: javax.servlet;version="2.6.0",
javax.servlet.http;version="2.6.0",
org.eclipse.equinox.http.servlet,
org.eclipse.jetty.server;version="7.0.0",
org.eclipse.jetty.server.handler;version="7.0.0",
org.eclipse.jetty.servlet;version="7.4.0",
org.eclipse.jetty.util.component;version="7.0.0"
org.eclipse.jetty.server;version="8.0.0",
org.eclipse.jetty.server.handler;version="8.0.0",
org.eclipse.jetty.servlet;version="8.0.0",
org.eclipse.jetty.util.component;version="8.0.0"
Export-Package: org.eclipse.jetty.osgi.httpservice;version="8.0.0"

2
jetty-plus/pom.xml
View File

@ -28,7 +28,7 @@
<configuration>
<instructions>
<_versionpolicy> </_versionpolicy>
<Import-Package>!javax.sql.*;!javax.security.*;!javax.naming.*;javax.servlet.*;version="[3.0,4.0)",javax.transaction.*;version="[1.1,1.2)",*</Import-Package>
<Import-Package>!javax.sql.*;!javax.security.*;!javax.naming.*;javax.servlet.*;version="2.6.0",javax.transaction.*;version="[1.1,1.2)",*</Import-Package>
</instructions>
</configuration>
</execution>

5
jetty-rewrite/pom.xml
View File

@ -22,6 +22,11 @@
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

2
jetty-security/pom.xml
View File

@ -24,7 +24,7 @@
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="[3.0,4.0)",javax.security.cert,*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",javax.security.cert,*</Import-Package>
</instructions>
</configuration>

2
jetty-server/pom.xml
View File

@ -26,7 +26,7 @@
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="[3.0,4.0)",org.eclipse.jetty.jmx.*;version="[7.3,8)";resolution:=optional,*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",org.eclipse.jetty.jmx.*;version="8.0";resolution:=optional,*</Import-Package>
</instructions>
</configuration>
</execution>

2
jetty-servlet/pom.xml
View File

@ -25,7 +25,7 @@
</goals>
<configuration>
<instructions>
<Import-Package>org.eclipse.jetty.jmx.*;version="[7.3,8)";resolution:=optional,*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",org.eclipse.jetty.jmx.*;version="8.0";resolution:=optional,*</Import-Package>
</instructions>
</configuration>
</execution>

5
jetty-servlets/pom.xml
View File

@ -23,6 +23,11 @@
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

2
jetty-util/pom.xml
View File

@ -24,7 +24,7 @@
</goals>
<configuration>
<instructions>
<Import-Package>org.slf4j;version="[1.5,1.7)";resolution:=optional,org.slf4j.impl;version="[1.5,1.7)";resolution:=optional,*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,*</Import-Package>
</instructions>
</configuration>
</execution>

5
jetty-webapp/pom.xml
View File

@ -52,6 +52,11 @@
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

5
jetty-websocket/pom.xml
View File

@ -59,6 +59,11 @@
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Import-Package>javax.servlet.*;version="2.6.0",*</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

2
test-jetty-webapp/pom.xml
View File

@ -78,7 +78,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>org.eclipse.jetty.test-jetty-webapp</Bundle-SymbolicName>
<Import-Package>javax.servlet,org.eclipse.jetty.servlets,*</Import-Package>
<Import-Package>javax.servlet.*;version="2.6.0",org.eclipse.jetty.servlets,*</Import-Package>
<Export-Package>!com.acme*</Export-Package>
<!-- the test webapp is configured via a jetty xml file
in order to add the security handler. -->

4
test-jetty-webapp/src/main/webapp/META-INF/MANIFEST.MF
View File

@ -4,8 +4,8 @@ Bundle-Name: TestIt
Bundle-SymbolicName: TestIt
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: testit.Activator
Import-Package: javax.servlet,
javax.servlet.http,
Import-Package: javax.servlet;version="2.6",
javax.servlet.http;version="2.6",
javax.servlet.jsp,
javax.servlet.jsp.tagext
Require-Bundle: org.eclipse.jetty.client,