Issue #4568 - update to use jakarta.servlet 5.0.0

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

NOTICE.txt

@@ -39,7 +39,7 @@ The following dependencies are EPL and CDDL 1.0.
 The following dependencies are CDDL + GPLv2 with classpath exception.
 https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
 
- * javax.servlet:javax.servlet-api
+ * jakarta.servlet:jakarta.servlet-api
  * javax.annotation:javax.annotation-api
  * javax.transaction:javax.transaction-api
  * javax.websocket:javax.websocket-api

VERSION.txt

@@ -2175,7 +2175,7 @@ jetty-9.4.0.M0 - 03 June 2016
  + 437786 SslContextFactory: Allow Password.getPassword to be overridden
  + 469 Update to Apache Jasper 8.0.33
  + 472675 No main manifest attribute, in jetty-runner regression
- + 478918 Change javax.servlet.error,forward,include literals to
+ + 478918 Change jakarta.servlet.error,forward,include literals to
    RequestDispatcher constants
  + 479179 Fixed NPE from debug
  + 479343 calls to MetaData#orderFragments() with relative ordering adds
@@ -2390,7 +2390,7 @@ jetty-9.3.8.RC0 - 25 February 2016
  + 352 Integrate session idling for MongoSessionManager
  + 354 Spin loop in case of exception thrown during accept()
  + 355 Improve close behavior for failed pending writes
- + 478918 Change javax.servlet.error,forward,include literals to
+ + 478918 Change jakarta.servlet.error,forward,include literals to
    RequestDispatcher constants
  + 484446 InputStreamResponseListener's InputStream uses default read (3) and
    blocks early on never-ending response.
@@ -3693,7 +3693,7 @@ jetty-9.2.0.M1 - 08 May 2014
  + 432468 Improve command CGI path handling
  + 432473 web.xml declaration order of filters not preserved on calls to init()
  + 432483 make osgi.serviceloader support for
-   javax.servlet.ServletContainerInitializer optional (cherry picked from
+   jakarta.servlet.ServletContainerInitializer optional (cherry picked from
    commit 31043d25708edbea9ef31948093f4eaf2247919b)
  + 432528 IllegalStateException when using DeferredContentProvider
  + 432777 Async Write Loses Data with HTTPS Server
@@ -3782,7 +3782,7 @@ jetty-9.1.5.v20140505 - 05 May 2014
  + 432270 Slow requests with response content delimited by EOF fail
  + 432473 web.xml declaration order of filters not preserved on calls to init()
  + 432483 make osgi.serviceloader support for
-   javax.servlet.ServletContainerInitializer optional (cherry picked from
+   jakarta.servlet.ServletContainerInitializer optional (cherry picked from
    commit 31043d25708edbea9ef31948093f4eaf2247919b)
  + 432528 IllegalStateException when using DeferredContentProvider
  + 432777 Async Write Loses Data with HTTPS Server
@@ -5678,7 +5678,7 @@ jetty-8.1.3.v20120416 - 16 April 2012
  + 373952 bind called too frequently on refresh
  + 374018 correctly handle requestperminuted underflow
  + 374152 jetty-all-server MANIFEST contains wrong import:
-   javax.servlet.annotation;version="[2.6,3)"
+   jakarta.servlet.annotation;version="[2.6,3)"
  + 374252 SslConnection.onClose() does not forward to nested connection
  + 374258 SPDY leaks SSLEngines. Made the test more reliable
  + 374367 NPE in QueuedThreadPool.dump() with early java6 jvms
@@ -5955,7 +5955,7 @@ jetty-7.6.0.RC2 - 22 December 2011
  + JETTY-1465 NPE in ContextHandler.toString
 
 jetty-8.1.0.RC1 - 06 December 2011
- + 360245 The version of the javax.servlet packages to import is 2.6 instead of
+ + 360245 The version of the jakarta.servlet packages to import is 2.6 instead of
    3.0
  + 365370 ServletHandler can fall through to nested handler
 
@@ -7484,7 +7484,7 @@ jetty-7.0.0.M0 - 27 March 2009
  + JETTY-814 Add org.eclipse.jetty.client.Address.toString()
  + JETTY-816 Implement reconnect on java bayeux client
  + JETTY-817 Aborted SSL connections may cause jetty to hang with full cpu
- + JETTY-818 Support javax.servlet.request.ssl_session_id
+ + JETTY-818 Support jakarta.servlet.request.ssl_session_id
  + JETTY-821 Allow lazy loading of persistent sessions
  + JETTY-822 Commit when autocommit=true causes error with mysql
  + JETTY-823 Extend start.config profiles
@@ -8025,7 +8025,7 @@ jetty-7.0.0pre0 - 21 April 2008
  + Ensure Jotm tx mgr can be found in jetty-env.xml
  + HttpClient supports pipelined request
  + Jetty-6.1.8 Changes
- + Make javax.servlet.jsp optional osgi import for jetty module
+ + Make jakarta.servlet.jsp optional osgi import for jetty module
  + QueuedThreadPool default
  + Refactor of Continuation towards servlet 3.0 proposal
  + Renamed modules management and naming to jmx and jndi.
@@ -8045,7 +8045,7 @@ jetty-6.1.9 - 26 March 2008
  + JETTY-538 test harness fix for windows
  + JETTY-541 Cometd per client timeouts
  + Ensure Jotm tx mgr can be found in jetty-env.xml
- + Make javax.servlet.jsp optional osgi import for jetty module
+ + Make jakarta.servlet.jsp optional osgi import for jetty module
 
 jetty-6.1.8 - 28 February 2008
  + JETTY-350 log ssl errors on SslSocketConnector
@@ -8155,7 +8155,7 @@ jetty-6.1.6rc0 - 03 October 2007
  + JETTY-407 AJP handles unknown content length
  + JETTY-413 Make rolloveroutputstream timer daemon
  + JETTY-422 Allow <Property> values to be null in config files
- + JETTY-423 Ensure javax.servlet.forward parameters are latched on first
+ + JETTY-423 Ensure jakarta.servlet.forward parameters are latched on first
    forward
  + JETTY-425 Handle duplicate stop calls better
  + JETTY-430 improved cometd logging
@@ -8511,7 +8511,7 @@ jetty-6.1.0rc0 - 08 December 2006
  + Added org.mortbay.thread.concurrent.ThreadPool
  + Added spring ejb3 demo example
  + DefaultHandler links virtual hosts.
- + Dispatcher does not protect javax.servlet attributes
+ + Dispatcher does not protect jakarta.servlet attributes
  + Fixed cachesize on invalidate
  + Fixed idle timeout
  + flush if content-length written
@@ -11017,7 +11017,7 @@ jetty-2.3.0A - 22 September 1999
  + Expanded tabs to spaces in source.
  + Made session IDs less predictable and removed race.
  + ServerContext available to HtmlFilters via context param
- + Use javax.servlet classes from JWSDK1.0
+ + Use jakarta.servlet classes from JWSDK1.0
 
 jetty-2.2.8 - 15 September 1999
  + Added disableLog() to turn off logging.
@@ -11395,11 +11395,11 @@ jetty-2.0Alpha2 - 01 May 1998
  + Added timezone to Log
  + Handle params in getIntHeader and getDateHeader
  + Handle Single Threaded servlets with servlet pool
- + JDK1.2 javax.servlet API
+ + JDK1.2 jakarta.servlet API
  + Removed HttpRequest.getByteContent
- + Use javax.servlet.http.Cookie
- + Use javax.servlet.http.HttpSession
- + Use javax.servlet.http.HttpUtils.parsePostData
+ + Use jakarta.servlet.http.Cookie
+ + Use jakarta.servlet.http.HttpSession
+ + Use jakarta.servlet.http.HttpUtils.parsePostData
 
 jetty-1.3.5 - 01 May 1998
  + Added date format to Log

aggregates/jetty-all/pom.xml

@@ -214,7 +214,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-servlet-api</artifactId>
+      <artifactId>jetty-jakarta-servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.transaction</groupId>

aggregates/jetty-websocket-all/pom.xml

@@ -24,7 +24,7 @@
             </goals>
             <configuration>
               <excludes>**/MANIFEST.MF</excludes>
-              <excludeGroupIds>jakarta.annotation,org.objectweb.asm,javax.servlet,org.slf4j,org.eclipse.jetty.orbit,org.mortbay.jetty.npn</excludeGroupIds>
+              <excludeGroupIds>jakarta.annotation,org.objectweb.asm,jakarta.servlet,org.slf4j,org.eclipse.jetty.orbit,org.mortbay.jetty.npn</excludeGroupIds>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -149,7 +149,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-servlet-api</artifactId>
+      <artifactId>jetty-jakarta-servlet-api</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>

apache-jsp/pom.xml

@@ -28,7 +28,7 @@
             <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
             </Require-Capability>
             <Provide-Capability>
-              osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log
+              osgi.serviceloader;osgi.serviceloader=jakarta.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log
             </Provide-Capability>
             <_nouses>true</_nouses>
           </instructions>
@@ -74,7 +74,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-servlet-api</artifactId>
+      <artifactId>jetty-jakarta-servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>

apache-jsp/src/main/java/module-info.java

@@ -16,8 +16,7 @@
 // ========================================================================
 //
 
-import javax.servlet.ServletContainerInitializer;
-
+import jakarta.servlet.ServletContainerInitializer;
 import org.apache.juli.logging.Log;
 import org.eclipse.jetty.apache.jsp.JettyJasperInitializer;
 import org.eclipse.jetty.apache.jsp.JuliLog;

apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java

@@ -23,8 +23,8 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import javax.servlet.ServletContext;
 
+import jakarta.servlet.ServletContext;
 import org.apache.jasper.servlet.JasperInitializer;
 import org.apache.jasper.servlet.TldScanner;
 import org.apache.juli.logging.Log;

apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java

@@ -20,8 +20,8 @@
 
 import java.net.URL;
 import java.util.Collection;
-import javax.servlet.ServletContext;
 
+import jakarta.servlet.ServletContext;
 import org.apache.jasper.servlet.TldPreScanned;
 import org.apache.tomcat.util.descriptor.tld.TldResourcePath;
 

apache-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java

@@ -22,11 +22,11 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.jasper.servlet.JspServlet;
 
 /**

apache-jsp/src/test/java/org/eclipse/jetty/jsp/TestJettyJspServlet.java

@@ -22,12 +22,12 @@
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspFactory;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspFactory;
 import org.apache.jasper.runtime.JspFactoryImpl;
 import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.SimpleInstanceManager;

apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java

@@ -31,9 +31,9 @@ public class JspConfig
 {
     public static void init(WebAppContext context, URI baseUri, File scratchDir)
     {
-        context.setAttribute("javax.servlet.context.tempdir", scratchDir);
+        context.setAttribute("jakarta.servlet.context.tempdir", scratchDir);
         context.setAttribute("org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
-            ".*/jetty-servlet-api-[^/]*\\.jar$|.*javax.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar");
+            ".*/jetty-jakarta-servlet-api-[^/]*\\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-impl-.*\\.jar");
         context.setWar(baseUri.toASCIIString());
         context.setResourceBase(baseUri.toASCIIString());
     }

apache-jstl/src/test/java/org/eclipse/jetty/jstl/JstlTest.java

@@ -24,8 +24,8 @@
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.jsp.JspException;
 
+import jakarta.servlet.jsp.JspException;
 import org.eclipse.jetty.annotations.AnnotationConfiguration;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;

examples/async-rest/async-rest-jar/pom.xml

@@ -28,7 +28,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-servlet-api</artifactId>
+      <artifactId>jetty-jakarta-servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AbstractRestServlet.java

@@ -24,11 +24,12 @@
 import java.net.URLEncoder;
 import java.util.Map;
 import java.util.Queue;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Abstract Servlet implementation class AsyncRESTServlet.

examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java

@@ -25,12 +25,12 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.Response;
 import org.eclipse.jetty.client.api.Result;

examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/SerialRestServlet.java

@@ -27,10 +27,10 @@
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Queue;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.util.ajax.JSON;
 
 /**

examples/async-rest/async-rest-webapp/pom.xml

@@ -32,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-servlet-api</artifactId>
+      <artifactId>jetty-jakarta-servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

examples/embedded/src/main/java/org/eclipse/jetty/embedded/AsyncEchoServlet.java

@@ -20,14 +20,15 @@
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.servlet.AsyncContext;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class AsyncEchoServlet extends HttpServlet
 {

examples/embedded/src/main/java/org/eclipse/jetty/embedded/DumpServlet.java

@@ -21,10 +21,11 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Collections;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
 public class DumpServlet extends HttpServlet

examples/embedded/src/main/java/org/eclipse/jetty/embedded/FastFileServer.java

@@ -25,11 +25,11 @@
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileChannel.MapMode;
 import java.nio.file.StandardOpenOption;
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpOutput;