diff --git a/VERSION.txt b/VERSION.txt index 5b686062831..8c33c1aaf4e 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -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 diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml index 9add0c35961..1e4e1f404d2 100644 --- a/jetty-aggregate/jetty-all-server/pom.xml +++ b/jetty-aggregate/jetty-all-server/pom.xml @@ -75,10 +75,9 @@ !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, diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index 31523119e34..452ce37a7d9 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -21,6 +21,11 @@ manifest + + + javax.servlet.*;version="2.6.0",* + + diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 84a2a00bf2c..beaf0145c6c 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -42,7 +42,7 @@ - javax.servlet.*;version="3.0",* + javax.servlet.*;version="2.6.0",* diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index fd0303ea879..b5ffd3d3823 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -24,7 +24,7 @@ - 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,* + 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,* diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index ddc4f1c10e5..52ef11a50b2 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -24,7 +24,7 @@ - org.eclipse.jetty.jmx.*;version="[7.3,8)";resolution:=optional,* + org.eclipse.jetty.jmx.*;version="8.0";resolution:=optional,* diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index eebb8c2e5d6..a14d46f59ed 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -42,7 +42,7 @@ - javax.net.*,* + javax.servlet.*;version="2.6.0",javax.net.*,* diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index f64ce709727..a22cd4ca7b1 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -22,6 +22,11 @@ manifest + + + javax.servlet.*;version="2.6.0",* + + diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml index fbc9ad575a3..b6048c55e9d 100644 --- a/jetty-nested/pom.xml +++ b/jetty-nested/pom.xml @@ -26,7 +26,7 @@ - javax.servlet*;version="2.5.0",* + javax.servlet.*;version="2.6.0",* diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index ba4c50b5c7a..5ea21e24b8b 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -28,7 +28,7 @@ maven-bundle-plugin - 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",* + 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",* true diff --git a/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF index dd7d7e3523b..d586e1cc310 100644 --- a/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF +++ b/jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF @@ -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, diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 878c70cd4ee..75a036f115b 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -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, diff --git a/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF b/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF index 688b721821c..3ac50838895 100644 --- a/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF +++ b/jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF @@ -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" - diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index c267bfb8e9b..a9ece56d8c7 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -28,7 +28,7 @@ <_versionpolicy> - !javax.sql.*;!javax.security.*;!javax.naming.*;javax.servlet.*;version="[3.0,4.0)",javax.transaction.*;version="[1.1,1.2)",* + !javax.sql.*;!javax.security.*;!javax.naming.*;javax.servlet.*;version="2.6.0",javax.transaction.*;version="[1.1,1.2)",* diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index faa740608e7..7f6b2076d20 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -22,6 +22,11 @@ manifest + + + javax.servlet.*;version="2.6.0",* + + diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 2515958c0f6..6fb65bedf62 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -24,7 +24,7 @@ - javax.servlet.*;version="[3.0,4.0)",javax.security.cert,* + javax.servlet.*;version="2.6.0",javax.security.cert,* diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 7f5c17aacc7..13b34bc98af 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -26,7 +26,7 @@ - javax.servlet.*;version="[3.0,4.0)",org.eclipse.jetty.jmx.*;version="[7.3,8)";resolution:=optional,* + javax.servlet.*;version="2.6.0",org.eclipse.jetty.jmx.*;version="8.0";resolution:=optional,* diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 7ef1a382193..207fc68c4e3 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -25,7 +25,7 @@ - org.eclipse.jetty.jmx.*;version="[7.3,8)";resolution:=optional,* + javax.servlet.*;version="2.6.0",org.eclipse.jetty.jmx.*;version="8.0";resolution:=optional,* diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 3be25d852e3..9cef0decfff 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -23,6 +23,11 @@ manifest + + + javax.servlet.*;version="2.6.0",* + + diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index fbd408a9b86..7891a827721 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -24,7 +24,7 @@ - org.slf4j;version="[1.5,1.7)";resolution:=optional,org.slf4j.impl;version="[1.5,1.7)";resolution:=optional,* + 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,* diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index cf6109dfedf..47f52311ed5 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -52,6 +52,11 @@ manifest + + + javax.servlet.*;version="2.6.0",* + + diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index c366dd019d0..964d3874a6a 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -59,6 +59,11 @@ manifest + + + javax.servlet.*;version="2.6.0",* + + diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml index 7b6f6ddc504..ffbfdd2386d 100644 --- a/test-jetty-webapp/pom.xml +++ b/test-jetty-webapp/pom.xml @@ -78,7 +78,7 @@ org.eclipse.jetty.test-jetty-webapp - javax.servlet,org.eclipse.jetty.servlets,* + javax.servlet.*;version="2.6.0",org.eclipse.jetty.servlets,* !com.acme* diff --git a/test-jetty-webapp/src/main/webapp/META-INF/MANIFEST.MF b/test-jetty-webapp/src/main/webapp/META-INF/MANIFEST.MF index cc61b1a6525..cfe644d8a62 100644 --- a/test-jetty-webapp/src/main/webapp/META-INF/MANIFEST.MF +++ b/test-jetty-webapp/src/main/webapp/META-INF/MANIFEST.MF @@ -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,