jenkinsci · basil · Jun 26, 2024
diff --git a/core/example/src/example/Book.java b/core/example/src/example/Book.java
@@ -1,7 +1,7 @@
 package example;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 

diff --git a/core/example/src/example/BookStore.java b/core/example/src/example/BookStore.java
@@ -1,9 +1,9 @@
 package example;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Hashtable;
 import java.util.Map;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 

diff --git a/core/example/src/example/WebAppMain.java b/core/example/src/example/WebAppMain.java
@@ -1,7 +1,7 @@
 package example;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import org.kohsuke.stapler.Stapler;
 
 /**

diff --git a/core/maven-example/pom.xml b/core/maven-example/pom.xml
@@ -16,21 +16,21 @@
       <version>1.253</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp.jstl</groupId>
-      <artifactId>javax.servlet.jsp.jstl-api</artifactId>
-      <version>1.2.1</version>
+      <groupId>jakarta.servlet.jsp.jstl</groupId>
+      <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+      <version>2.0.0</version>
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>javax.servlet.jsp-api</artifactId>
-      <version>2.3.0</version>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <version>3.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/core/maven-example/src/main/java/example/Book.java b/core/maven-example/src/main/java/example/Book.java
@@ -1,7 +1,7 @@
 package example;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 

diff --git a/core/maven-example/src/main/java/example/BookStore.java b/core/maven-example/src/main/java/example/BookStore.java
@@ -1,9 +1,9 @@
 package example;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Hashtable;
 import java.util.Map;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 

diff --git a/core/maven-example/src/main/java/example/WebAppMain.java b/core/maven-example/src/main/java/example/WebAppMain.java
@@ -1,7 +1,7 @@
 package example;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import org.kohsuke.stapler.Stapler;
 
 /**

diff --git a/core/pom.xml b/core/pom.xml
@@ -65,7 +65,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-fileupload2-javax</artifactId>
+      <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
       <version>${commons-fileupload2.version}</version>
     </dependency>
     <dependency>
@@ -79,6 +79,11 @@
       <version>2.4.21</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-servlet-api</artifactId>
+      <version>4.0.6</version>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>annotation-indexer</artifactId>
@@ -108,7 +113,7 @@
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>4.0.4</version>
+      <version>5.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -140,13 +145,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee8</groupId>
-      <artifactId>jetty-ee8-servlet</artifactId>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-servlet</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.ee8</groupId>
-      <artifactId>jetty-ee8-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-webapp</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/core/src/main/java/io/jenkins/servlet/AsyncContextWrapper.java b/core/src/main/java/io/jenkins/servlet/AsyncContextWrapper.java
@@ -0,0 +1,192 @@
+package io.jenkins.servlet;
+
+import io.jenkins.servlet.http.HttpServletRequestWrapper;
+import io.jenkins.servlet.http.HttpServletResponseWrapper;
+import java.util.Objects;
+import javax.servlet.AsyncContext;
+import javax.servlet.AsyncListener;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class AsyncContextWrapper {
+    public static jakarta.servlet.AsyncContext toJakartaAsyncContext(AsyncContext from) {
+        Objects.requireNonNull(from);
+        return new jakarta.servlet.AsyncContext() {
+            @Override
+            public jakarta.servlet.ServletRequest getRequest() {
+                ServletRequest request = from.getRequest();
+                return request instanceof HttpServletRequest
+                        ? HttpServletRequestWrapper.toJakartaHttpServletRequest(((HttpServletRequest) request))
+                        : io.jenkins.servlet.ServletRequestWrapper.toJakartaServletRequest(request);
+            }
+
+            @Override
+            public jakarta.servlet.ServletResponse getResponse() {
+                ServletResponse response = from.getResponse();
+                return response instanceof HttpServletResponse
+                        ? HttpServletResponseWrapper.toJakartaHttpServletResponse(((HttpServletResponse) response))
+                        : ServletResponseWrapper.toJakartaServletResponse(response);
+            }
+
+            @Override
+            public boolean hasOriginalRequestAndResponse() {
+                return from.hasOriginalRequestAndResponse();
+            }
+
+            @Override
+            public void dispatch() {
+                from.dispatch();
+            }
+
+            @Override
+            public void dispatch(String path) {
+                from.dispatch(path);
+            }
+
+            @Override
+            public void dispatch(jakarta.servlet.ServletContext context, String path) {
+                from.dispatch(ServletContextWrapper.fromJakartServletContext(context), path);
+            }
+
+            @Override
+            public void complete() {
+                from.complete();
+            }
+
+            @Override
+            public void start(Runnable run) {
+                from.start(run);
+            }
+
+            @Override
+            public void addListener(jakarta.servlet.AsyncListener listener) {
+                from.addListener(AsyncListenerWrapper.fromJakartaAsyncListener(listener));
+            }
+
+            @Override
+            public void addListener(
+                    jakarta.servlet.AsyncListener listener,
+                    jakarta.servlet.ServletRequest servletRequest,
+                    jakarta.servlet.ServletResponse servletResponse) {
+                from.addListener(
+                        AsyncListenerWrapper.fromJakartaAsyncListener(listener),
+                        servletRequest instanceof jakarta.servlet.http.HttpServletRequest
+                                ? HttpServletRequestWrapper.fromJakartaHttpServletRequest(
+                                        (jakarta.servlet.http.HttpServletRequest) servletRequest)
+                                : io.jenkins.servlet.ServletRequestWrapper.fromJakartaServletRequest(servletRequest),
+                        servletResponse instanceof jakarta.servlet.http.HttpServletResponse
+                                ? HttpServletResponseWrapper.fromJakartaHttpServletResponse(
+                                        (jakarta.servlet.http.HttpServletResponse) servletResponse)
+                                : ServletResponseWrapper.fromJakartaServletResponse(servletResponse));
+            }
+
+            @Override
+            public <T extends jakarta.servlet.AsyncListener> T createListener(Class<T> clazz) {
+                // TODO implement this
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void setTimeout(long timeout) {
+                from.setTimeout(timeout);
+            }
+
+            @Override
+            public long getTimeout() {
+                return from.getTimeout();
+            }
+        };
+    }
+
+    public static AsyncContext fromJakartaAsyncContext(jakarta.servlet.AsyncContext from) {
+        Objects.requireNonNull(from);
+        return new AsyncContext() {
+            @Override
+            public ServletRequest getRequest() {
+                jakarta.servlet.ServletRequest request = from.getRequest();
+                return request instanceof jakarta.servlet.http.HttpServletRequest
+                        ? HttpServletRequestWrapper.fromJakartaHttpServletRequest(
+                                (jakarta.servlet.http.HttpServletRequest) request)
+                        : ServletRequestWrapper.fromJakartaServletRequest(request);
+            }
+
+            @Override
+            public ServletResponse getResponse() {
+                jakarta.servlet.ServletResponse response = from.getResponse();
+                return response instanceof jakarta.servlet.http.HttpServletResponse
+                        ? HttpServletResponseWrapper.fromJakartaHttpServletResponse(
+                                (jakarta.servlet.http.HttpServletResponse) response)
+                        : ServletResponseWrapper.fromJakartaServletResponse(response);
+            }
+
+            @Override
+            public boolean hasOriginalRequestAndResponse() {
+                return from.hasOriginalRequestAndResponse();
+            }
+
+            @Override
+            public void dispatch() {
+                from.dispatch();
+            }
+
+            @Override
+            public void dispatch(String path) {
+                from.dispatch(path);
+            }
+
+            @Override
+            public void dispatch(ServletContext context, String path) {
+                from.dispatch(ServletContextWrapper.toJakartaServletContext(context), path);
+            }
+
+            @Override
+            public void complete() {
+                from.complete();
+            }
+
+            @Override
+            public void start(Runnable run) {
+                from.start(run);
+            }
+
+            @Override
+            public void addListener(AsyncListener listener) {
+                from.addListener(AsyncListenerWrapper.toJakartaAsyncListener(listener));
+            }
+
+            @Override
+            public void addListener(
+                    AsyncListener listener, ServletRequest servletRequest, ServletResponse servletResponse) {
+                from.addListener(
+                        AsyncListenerWrapper.toJakartaAsyncListener(listener),
+                        servletRequest instanceof HttpServletRequest
+                                ? HttpServletRequestWrapper.toJakartaHttpServletRequest(
+                                        ((HttpServletRequest) servletRequest))
+                                : io.jenkins.servlet.ServletRequestWrapper.toJakartaServletRequest(servletRequest),
+                        servletResponse instanceof HttpServletResponse
+                                ? HttpServletResponseWrapper.toJakartaHttpServletResponse(
+                                        ((HttpServletResponse) servletResponse))
+                                : ServletResponseWrapper.toJakartaServletResponse(servletResponse));
+            }
+
+            @Override
+            public <T extends AsyncListener> T createListener(Class<T> clazz) {
+                // TODO implement this
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void setTimeout(long timeout) {
+                from.setTimeout(timeout);
+            }
+
+            @Override
+            public long getTimeout() {
+                return from.getTimeout();
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/io/jenkins/servlet/AsyncEventWrapper.java b/core/src/main/java/io/jenkins/servlet/AsyncEventWrapper.java
@@ -0,0 +1,24 @@
+package io.jenkins.servlet;
+
+import java.util.Objects;
+import javax.servlet.AsyncEvent;
+
+public class AsyncEventWrapper {
+    public static jakarta.servlet.AsyncEvent toJakartaServletHttpAsyncEvent(AsyncEvent from) {
+        Objects.requireNonNull(from);
+        return new jakarta.servlet.AsyncEvent(
+                AsyncContextWrapper.toJakartaAsyncContext(from.getAsyncContext()),
+                io.jenkins.servlet.ServletRequestWrapper.toJakartaServletRequest(from.getSuppliedRequest()),
+                ServletResponseWrapper.toJakartaServletResponse(from.getSuppliedResponse()),
+                from.getThrowable());
+    }
+
+    public static AsyncEvent fromJakartaServletHttpAsyncEvent(jakarta.servlet.AsyncEvent from) {
+        Objects.requireNonNull(from);
+        return new AsyncEvent(
+                AsyncContextWrapper.fromJakartaAsyncContext(from.getAsyncContext()),
+                ServletRequestWrapper.fromJakartaServletRequest(from.getSuppliedRequest()),
+                ServletResponseWrapper.fromJakartaServletResponse(from.getSuppliedResponse()),
+                from.getThrowable());
+    }
+}