Merge pull request eXist-db#4575 from evolvedbinary/feature/jetty-11

Upgrade to Jetty 11

Author: dizzzz

exist-core/pom.xml

@@ -166,8 +166,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>compile</scope>
         </dependency>
 
@@ -580,11 +580,6 @@
         </dependency>
 
         <!-- dependencies from exist-optional.jar -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.4</version>
-        </dependency>
         <dependency>
             <!--
                  NOTE(AR) This is needed to enable loading of Servlets etc

exist-core/src/main/java/org/exist/debuggee/DebuggeeFactory.java

@@ -21,8 +21,8 @@
  */
 package org.exist.debuggee;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

exist-core/src/main/java/org/exist/http/AuditTrailSessionListener.java

@@ -39,9 +39,9 @@
 import org.exist.xquery.value.AnyURIValue;
 import org.exist.xquery.value.Sequence;
 
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
 import java.util.Optional;
 import java.util.Properties;
 

exist-core/src/main/java/org/exist/http/Descriptor.java

@@ -35,7 +35,7 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;

exist-core/src/main/java/org/exist/http/RESTServer.java

@@ -84,8 +84,8 @@
 import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.XMLFilterImpl;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;

exist-core/src/main/java/org/exist/http/Response.java

@@ -23,7 +23,7 @@
 
 import org.exist.util.MimeType;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.DataOutputStream;
 import java.io.IOException;
 

exist-core/src/main/java/org/exist/http/SessionCountListener.java

@@ -21,8 +21,8 @@
  */
 package org.exist.http;
 
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class SessionCountListener implements HttpSessionListener {

exist-core/src/main/java/org/exist/http/filter/DumpFilter.java

@@ -24,9 +24,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.servlet.*;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.*;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.Enumeration;

exist-core/src/main/java/org/exist/http/filter/GuestFilter.java

@@ -24,10 +24,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.Enumeration;
 

exist-core/src/main/java/org/exist/http/filter/PathFilter.java

@@ -24,9 +24,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;

exist-core/src/main/java/org/exist/http/servlets/AbstractExistHttpServlet.java

@@ -21,6 +21,7 @@
  */
 package org.exist.http.servlets;
 
+import jakarta.servlet.annotation.MultipartConfig;
 import org.apache.logging.log4j.Logger;
 import org.exist.EXistException;
 import org.exist.http.urlrewrite.XQueryURLRewrite;
@@ -36,11 +37,11 @@
 import org.xmldb.api.base.Database;
 import org.xmldb.api.base.XMLDBException;
 
-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;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -54,6 +55,7 @@
  *
  * @author <a href="mailto:adam.retter@googlemail.com">Adam Retter</a>
  */
+@MultipartConfig
 public abstract class AbstractExistHttpServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 804071766041263220L;

exist-core/src/main/java/org/exist/http/servlets/Authenticator.java

@@ -23,8 +23,8 @@
 
 import org.exist.security.Subject;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

exist-core/src/main/java/org/exist/http/servlets/BasicAuthenticator.java

@@ -30,9 +30,9 @@
 import org.exist.storage.BrokerPool;
 import org.exist.xquery.XQueryContext;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -120,8 +120,8 @@ public Subject authenticate(
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * org.exist.http.servlets.Authenticator#sendChallenge(javax.servlet.http
-	 * .HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 * org.exist.http.servlets.Authenticator#sendChallenge(jakarta.servlet.http
+	 * .HttpServletRequest, jakarta.servlet.http.HttpServletResponse)
 	 */
 	public void sendChallenge(HttpServletRequest request,
 			HttpServletResponse response) throws IOException {

exist-core/src/main/java/org/exist/http/servlets/DigestAuthenticator.java

@@ -28,8 +28,8 @@
 import org.exist.security.internal.SubjectAccreditedImpl;
 import org.exist.storage.BrokerPool;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

exist-core/src/main/java/org/exist/http/servlets/EXistServlet.java

@@ -38,10 +38,10 @@
 import org.exist.validation.XmlLibraryChecker;
 import org.exist.xmldb.XmldbURI;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.EOFException;
 import java.io.IOException;
 import java.net.URI;

exist-core/src/main/java/org/exist/http/servlets/ExistExtensionServlet.java

@@ -21,7 +21,7 @@
  */
 package org.exist.http.servlets;
 
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
 
 public interface ExistExtensionServlet extends Servlet {