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

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

jetty-aggregate/jetty-all-server/pom.xml

@@ -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;version="2.6.0",
-                            javax.servlet.http;version="2.5.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,

jetty-ajp/pom.xml

@@ -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>

jetty-annotations/pom.xml

@@ -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>

jetty-continuation/pom.xml

@@ -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>

jetty-deploy/pom.xml

@@ -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>

jetty-http/pom.xml

@@ -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>

jetty-jaspi/pom.xml

@@ -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>

jetty-nested/pom.xml

@@ -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>

jetty-nosql/pom.xml

@@ -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>

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;version="2.6",
- javax.servlet.http;version="3.0",
+ 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,

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;version="2.6.0",
- javax.servlet.http;version="2.5.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,

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",
+Import-Package: javax.servlet;version="2.6.0",
- javax.servlet.http;version="3.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;version="8.0.0",
- org.eclipse.jetty.server.handler;version="7.0.0",
+ org.eclipse.jetty.server.handler;version="8.0.0",
- org.eclipse.jetty.servlet;version="7.4.0",
+ org.eclipse.jetty.servlet;version="8.0.0",
- org.eclipse.jetty.util.component;version="7.0.0"
+ org.eclipse.jetty.util.component;version="8.0.0"
 Export-Package: org.eclipse.jetty.osgi.httpservice;version="8.0.0"
-

jetty-plus/pom.xml

@@ -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>

jetty-rewrite/pom.xml

@@ -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>

jetty-security/pom.xml

@@ -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>
 

jetty-server/pom.xml

@@ -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>

jetty-servlet/pom.xml

@@ -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>

jetty-servlets/pom.xml

@@ -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>

jetty-util/pom.xml

@@ -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>

jetty-webapp/pom.xml

@@ -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>

jetty-websocket/pom.xml

@@ -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>

test-jetty-webapp/pom.xml

@@ -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. -->

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,
+Import-Package: javax.servlet;version="2.6",
- javax.servlet.http,
+ javax.servlet.http;version="2.6",
  javax.servlet.jsp,
  javax.servlet.jsp.tagext
 Require-Bundle: org.eclipse.jetty.client,