diff --git a/core/example/src/example/Book.java b/core/example/src/example/Book.java
index 9b69ec50dc..d57bcd55ba 100644
--- 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
index b1aced2332..a9a3b690a3 100644
--- 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
index a832fcc505..2912a6ff80 100644
--- 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
index 372fd2e2a1..3741f48006 100644
--- 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
index 9b69ec50dc..d57bcd55ba 100644
--- 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
index b1aced2332..a9a3b690a3 100644
--- 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
index a832fcc505..2912a6ff80 100644
--- 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
index 912ec1f1c8..444b40bce5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -10,7 +10,18 @@
   <artifactId>stapler</artifactId>
   <name>Stapler</name>
   <description>Stapler HTTP request handling engine</description>
+
+  <properties>
+    <bridge-method-injector.version>1.29</bridge-method-injector.version>
+    <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
+  </properties>
+
   <dependencies>
+    <dependency>
+      <groupId>com.infradna.tool</groupId>
+      <artifactId>bridge-method-annotation</artifactId>
+      <version>${bridge-method-injector.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.jcraft</groupId>
       <artifactId>jzlib</artifactId>
@@ -38,12 +49,6 @@
       <artifactId>commons-discovery</artifactId>
       <version>0.5</version>
     </dependency>
-    <dependency>
-      <!-- perhaps mark this dependency optional? -->
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.5</version>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -63,6 +68,17 @@
       <artifactId>javax.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
+    <!-- perhaps mark these dependencies optional? -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-fileupload2-core</artifactId>
+      <version>${commons-fileupload2.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
+      <version>${commons-fileupload2.version}</version>
+    </dependency>
     <dependency>
       <!--
         To allow stapler to be used from Groovy, code, we have a bit of tooling
@@ -103,7 +119,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>
@@ -131,17 +147,17 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <artifactId>jetty-util</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-servlet</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-webapp</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -178,6 +194,18 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>com.infradna.tool</groupId>
+        <artifactId>bridge-method-injector</artifactId>
+        <version>${bridge-method-injector.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
diff --git a/core/src/main/java/javax/servlet/AsyncContext.java b/core/src/main/java/javax/servlet/AsyncContext.java
new file mode 100644
index 0000000000..f6a39a958d
--- /dev/null
+++ b/core/src/main/java/javax/servlet/AsyncContext.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+public interface AsyncContext {
+    String ASYNC_REQUEST_URI = "javax.servlet.async.request_uri";
+
+    String ASYNC_CONTEXT_PATH = "javax.servlet.async.context_path";
+
+    String ASYNC_MAPPING = "javax.servlet.async.mapping";
+
+    String ASYNC_PATH_INFO = "javax.servlet.async.path_info";
+
+    String ASYNC_SERVLET_PATH = "javax.servlet.async.servlet_path";
+
+    String ASYNC_QUERY_STRING = "javax.servlet.async.query_string";
+
+    ServletRequest getRequest();
+
+    ServletResponse getResponse();
+
+    boolean hasOriginalRequestAndResponse();
+
+    void dispatch();
+
+    void dispatch(String path);
+
+    void dispatch(ServletContext context, String path);
+
+    void complete();
+
+    void start(Runnable run);
+
+    void addListener(AsyncListener listener);
+
+    void addListener(AsyncListener listener, ServletRequest servletRequest, ServletResponse servletResponse);
+
+    <T extends AsyncListener> T createListener(Class<T> clazz) throws ServletException;
+
+    void setTimeout(long timeout);
+
+    long getTimeout();
+}
diff --git a/core/src/main/java/javax/servlet/AsyncEvent.java b/core/src/main/java/javax/servlet/AsyncEvent.java
new file mode 100644
index 0000000000..6eac918794
--- /dev/null
+++ b/core/src/main/java/javax/servlet/AsyncEvent.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+public class AsyncEvent {
+    private AsyncContext context;
+    private ServletRequest request;
+    private ServletResponse response;
+    private Throwable throwable;
+
+    public AsyncEvent(AsyncContext context) {
+        this(context, context.getRequest(), context.getResponse(), null);
+    }
+
+    public AsyncEvent(AsyncContext context, ServletRequest request, ServletResponse response) {
+        this(context, request, response, null);
+    }
+
+    public AsyncEvent(AsyncContext context, Throwable throwable) {
+        this(context, context.getRequest(), context.getResponse(), throwable);
+    }
+
+    public AsyncEvent(AsyncContext context, ServletRequest request, ServletResponse response, Throwable throwable) {
+        this.context = context;
+        this.request = request;
+        this.response = response;
+        this.throwable = throwable;
+    }
+
+    public AsyncContext getAsyncContext() {
+        return context;
+    }
+
+    public ServletRequest getSuppliedRequest() {
+        return request;
+    }
+
+    public ServletResponse getSuppliedResponse() {
+        return response;
+    }
+
+    public Throwable getThrowable() {
+        return throwable;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/AsyncListener.java b/core/src/main/java/javax/servlet/AsyncListener.java
new file mode 100644
index 0000000000..c82b472282
--- /dev/null
+++ b/core/src/main/java/javax/servlet/AsyncListener.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import java.io.IOException;
+import java.util.EventListener;
+
+public interface AsyncListener extends EventListener {
+    void onComplete(AsyncEvent event) throws IOException;
+
+    void onTimeout(AsyncEvent event) throws IOException;
+
+    void onError(AsyncEvent event) throws IOException;
+
+    void onStartAsync(AsyncEvent event) throws IOException;
+}
diff --git a/core/src/main/java/javax/servlet/DispatcherType.java b/core/src/main/java/javax/servlet/DispatcherType.java
new file mode 100644
index 0000000000..d18a65a90a
--- /dev/null
+++ b/core/src/main/java/javax/servlet/DispatcherType.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+public enum DispatcherType {
+    FORWARD,
+    INCLUDE,
+    REQUEST,
+    ASYNC,
+    ERROR;
+
+    public static jakarta.servlet.DispatcherType toJakartaDispatcherType(DispatcherType from) {
+        switch (from) {
+            case FORWARD:
+                return jakarta.servlet.DispatcherType.FORWARD;
+            case INCLUDE:
+                return jakarta.servlet.DispatcherType.INCLUDE;
+            case REQUEST:
+                return jakarta.servlet.DispatcherType.REQUEST;
+            case ASYNC:
+                return jakarta.servlet.DispatcherType.ASYNC;
+            case ERROR:
+                return jakarta.servlet.DispatcherType.ERROR;
+            default:
+                throw new IllegalArgumentException("Unknown DispatcherType: " + from);
+        }
+    }
+
+    public static DispatcherType fromJakartaDispatcherType(jakarta.servlet.DispatcherType from) {
+        switch (from) {
+            case FORWARD:
+                return DispatcherType.FORWARD;
+            case INCLUDE:
+                return DispatcherType.INCLUDE;
+            case REQUEST:
+                return DispatcherType.REQUEST;
+            case ASYNC:
+                return DispatcherType.ASYNC;
+            case ERROR:
+                return DispatcherType.ERROR;
+            default:
+                throw new IllegalArgumentException("Unknown DispatcherType: " + from);
+        }
+    }
+}
diff --git a/core/src/main/java/javax/servlet/Filter.java b/core/src/main/java/javax/servlet/Filter.java
new file mode 100644
index 0000000000..7575fba6bc
--- /dev/null
+++ b/core/src/main/java/javax/servlet/Filter.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public interface Filter {
+    default void init(FilterConfig filterConfig) throws ServletException {}
+
+    void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException;
+
+    default void destroy() {}
+
+    default jakarta.servlet.Filter toJakartaFilter() {
+        return new jakarta.servlet.Filter() {
+            @Override
+            public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
+                try {
+                    Filter.this.init(FilterConfig.fromJakartaFilterConfig(filterConfig));
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+
+            @Override
+            public void doFilter(
+                    jakarta.servlet.ServletRequest request,
+                    jakarta.servlet.ServletResponse response,
+                    jakarta.servlet.FilterChain chain)
+                    throws IOException, jakarta.servlet.ServletException {
+                try {
+                    if (request instanceof jakarta.servlet.http.HttpServletRequest
+                            && response instanceof jakarta.servlet.http.HttpServletResponse) {
+                        jakarta.servlet.http.HttpServletRequest httpRequest =
+                                (jakarta.servlet.http.HttpServletRequest) request;
+                        jakarta.servlet.http.HttpServletResponse httpResponse =
+                                (jakarta.servlet.http.HttpServletResponse) response;
+                        Filter.this.doFilter(
+                                HttpServletRequest.fromJakartaHttpServletRequest(httpRequest),
+                                HttpServletResponse.fromJakartaHttpServletResponse(httpResponse),
+                                FilterChain.fromJakartaFilterChain(chain));
+                    } else {
+                        Filter.this.doFilter(
+                                ServletRequest.fromJakartaServletRequest(request),
+                                ServletResponse.fromJakartaServletResponse(response),
+                                FilterChain.fromJakartaFilterChain(chain));
+                    }
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+
+            @Override
+            public void destroy() {
+                Filter.this.destroy();
+            }
+        };
+    }
+
+    static Filter fromJakartaFilter(jakarta.servlet.Filter from) {
+        return new Filter() {
+            @Override
+            public void init(FilterConfig filterConfig) throws ServletException {
+                try {
+                    from.init(filterConfig.toJakartaFilterConfig());
+                } catch (jakarta.servlet.ServletException e) {
+                    throw new ServletException(e);
+                }
+            }
+
+            @Override
+            public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+                    throws IOException, ServletException {
+                try {
+                    if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) {
+                        HttpServletRequest httpRequest = (HttpServletRequest) request;
+                        HttpServletResponse httpResponse = (HttpServletResponse) response;
+                        from.doFilter(
+                                httpRequest.toJakartaHttpServletRequest(),
+                                httpResponse.toJakartaHttpServletResponse(),
+                                chain.toJakartaFilterChain());
+                    } else {
+                        from.doFilter(
+                                request.toJakartaServletRequest(),
+                                response.toJakartaServletResponse(),
+                                chain.toJakartaFilterChain());
+                    }
+                } catch (jakarta.servlet.ServletException e) {
+                    throw new ServletException(e);
+                }
+            }
+
+            @Override
+            public void destroy() {
+                from.destroy();
+            }
+
+            @Override
+            public jakarta.servlet.Filter toJakartaFilter() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/FilterChain.java b/core/src/main/java/javax/servlet/FilterChain.java
new file mode 100644
index 0000000000..b8d594812a
--- /dev/null
+++ b/core/src/main/java/javax/servlet/FilterChain.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public interface FilterChain {
+    void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException;
+
+    default jakarta.servlet.FilterChain toJakartaFilterChain() {
+        return new jakarta.servlet.FilterChain() {
+            @Override
+            public void doFilter(jakarta.servlet.ServletRequest request, jakarta.servlet.ServletResponse response)
+                    throws IOException, jakarta.servlet.ServletException {
+                try {
+                    if (request instanceof jakarta.servlet.http.HttpServletRequest
+                            && response instanceof jakarta.servlet.http.HttpServletResponse) {
+                        jakarta.servlet.http.HttpServletRequest httpRequest =
+                                (jakarta.servlet.http.HttpServletRequest) request;
+                        jakarta.servlet.http.HttpServletResponse httpResponse =
+                                (jakarta.servlet.http.HttpServletResponse) response;
+                        FilterChain.this.doFilter(
+                                HttpServletRequest.fromJakartaHttpServletRequest(httpRequest),
+                                HttpServletResponse.fromJakartaHttpServletResponse(httpResponse));
+                    } else {
+                        FilterChain.this.doFilter(
+                                ServletRequest.fromJakartaServletRequest(request),
+                                ServletResponse.fromJakartaServletResponse(response));
+                    }
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+        };
+    }
+
+    static FilterChain fromJakartaFilterChain(jakarta.servlet.FilterChain from) {
+        return new FilterChain() {
+            @Override
+            public void doFilter(ServletRequest request, ServletResponse response)
+                    throws IOException, ServletException {
+                try {
+                    if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) {
+                        HttpServletRequest httpRequest = (HttpServletRequest) request;
+                        HttpServletResponse httpResponse = (HttpServletResponse) response;
+                        from.doFilter(
+                                httpRequest.toJakartaHttpServletRequest(), httpResponse.toJakartaHttpServletResponse());
+                    } else {
+                        from.doFilter(request.toJakartaServletRequest(), response.toJakartaServletResponse());
+                    }
+                } catch (jakarta.servlet.ServletException e) {
+                    throw new ServletException(e);
+                }
+            }
+
+            @Override
+            public jakarta.servlet.FilterChain toJakartaFilterChain() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/FilterConfig.java b/core/src/main/java/javax/servlet/FilterConfig.java
new file mode 100644
index 0000000000..3e84eaa730
--- /dev/null
+++ b/core/src/main/java/javax/servlet/FilterConfig.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.util.Enumeration;
+
+public interface FilterConfig {
+    String getFilterName();
+
+    ServletContext getServletContext();
+
+    String getInitParameter(String name);
+
+    Enumeration<String> getInitParameterNames();
+
+    default jakarta.servlet.FilterConfig toJakartaFilterConfig() {
+        return new jakarta.servlet.FilterConfig() {
+            @Override
+            public String getFilterName() {
+                return FilterConfig.this.getFilterName();
+            }
+
+            @Override
+            public jakarta.servlet.ServletContext getServletContext() {
+                return FilterConfig.this.getServletContext().toJakartaServletContext();
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return FilterConfig.this.getInitParameter(name);
+            }
+
+            @Override
+            public Enumeration<String> getInitParameterNames() {
+                return FilterConfig.this.getInitParameterNames();
+            }
+        };
+    }
+
+    static FilterConfig fromJakartaFilterConfig(jakarta.servlet.FilterConfig from) {
+        return new FilterConfig() {
+            @Override
+            public String getFilterName() {
+                return from.getFilterName();
+            }
+
+            @Override
+            public ServletContext getServletContext() {
+                return ServletContext.fromJakartServletContext(from.getServletContext());
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return from.getInitParameter(name);
+            }
+
+            @Override
+            public Enumeration<String> getInitParameterNames() {
+                return from.getInitParameterNames();
+            }
+
+            @Override
+            public jakarta.servlet.FilterConfig toJakartaFilterConfig() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/FilterRegistration.java b/core/src/main/java/javax/servlet/FilterRegistration.java
new file mode 100644
index 0000000000..7f011182d5
--- /dev/null
+++ b/core/src/main/java/javax/servlet/FilterRegistration.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public interface FilterRegistration extends Registration {
+    void addMappingForServletNames(
+            EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, String... servletNames);
+
+    Collection<String> getServletNameMappings();
+
+    void addMappingForUrlPatterns(EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, String... urlPatterns);
+
+    Collection<String> getUrlPatternMappings();
+
+    interface Dynamic extends FilterRegistration, Registration.Dynamic {
+        default jakarta.servlet.FilterRegistration.Dynamic toJakartaFilterRegistrationDynamic() {
+            return new jakarta.servlet.FilterRegistration.Dynamic() {
+                @Override
+                public String getName() {
+                    return FilterRegistration.Dynamic.this.getName();
+                }
+
+                @Override
+                public String getClassName() {
+                    return FilterRegistration.Dynamic.this.getClassName();
+                }
+
+                @Override
+                public boolean setInitParameter(String name, String value) {
+                    return FilterRegistration.Dynamic.this.setInitParameter(name, value);
+                }
+
+                @Override
+                public String getInitParameter(String name) {
+                    return FilterRegistration.Dynamic.this.getInitParameter(name);
+                }
+
+                @Override
+                public Set<String> setInitParameters(Map<String, String> initParameters) {
+                    return FilterRegistration.Dynamic.this.setInitParameters(initParameters);
+                }
+
+                @Override
+                public Map<String, String> getInitParameters() {
+                    return FilterRegistration.Dynamic.this.getInitParameters();
+                }
+
+                @Override
+                public void setAsyncSupported(boolean isAsyncSupported) {
+                    FilterRegistration.Dynamic.this.setAsyncSupported(isAsyncSupported);
+                }
+
+                @Override
+                public void addMappingForServletNames(
+                        EnumSet<jakarta.servlet.DispatcherType> dispatcherTypes,
+                        boolean isMatchAfter,
+                        String... servletNames) {
+                    FilterRegistration.Dynamic.this.addMappingForServletNames(
+                            EnumSet.copyOf(dispatcherTypes.stream()
+                                    .map(DispatcherType::fromJakartaDispatcherType)
+                                    .collect(Collectors.toSet())),
+                            isMatchAfter,
+                            servletNames);
+                }
+
+                @Override
+                public Collection<String> getServletNameMappings() {
+                    return FilterRegistration.Dynamic.this.getServletNameMappings();
+                }
+
+                @Override
+                public void addMappingForUrlPatterns(
+                        EnumSet<jakarta.servlet.DispatcherType> dispatcherTypes,
+                        boolean isMatchAfter,
+                        String... urlPatterns) {
+                    FilterRegistration.Dynamic.this.addMappingForUrlPatterns(
+                            EnumSet.copyOf(dispatcherTypes.stream()
+                                    .map(DispatcherType::fromJakartaDispatcherType)
+                                    .collect(Collectors.toSet())),
+                            isMatchAfter,
+                            urlPatterns);
+                }
+
+                @Override
+                public Collection<String> getUrlPatternMappings() {
+                    return FilterRegistration.Dynamic.this.getUrlPatternMappings();
+                }
+            };
+        }
+
+        static FilterRegistration.Dynamic fromJakartaFilterRegistrationDynamic(
+                jakarta.servlet.FilterRegistration.Dynamic from) {
+            return new FilterRegistration.Dynamic() {
+                @Override
+                public String getName() {
+                    return from.getName();
+                }
+
+                @Override
+                public String getClassName() {
+                    return from.getClassName();
+                }
+
+                @Override
+                public boolean setInitParameter(String name, String value) {
+                    return from.setInitParameter(name, value);
+                }
+
+                @Override
+                public String getInitParameter(String name) {
+                    return from.getInitParameter(name);
+                }
+
+                @Override
+                public Set<String> setInitParameters(Map<String, String> initParameters) {
+                    return from.setInitParameters(initParameters);
+                }
+
+                @Override
+                public Map<String, String> getInitParameters() {
+                    return from.getInitParameters();
+                }
+
+                @Override
+                public void setAsyncSupported(boolean isAsyncSupported) {
+                    from.setAsyncSupported(isAsyncSupported);
+                }
+
+                @Override
+                public void addMappingForServletNames(
+                        EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, String... servletNames) {
+                    from.addMappingForServletNames(
+                            EnumSet.copyOf(dispatcherTypes.stream()
+                                    .map(DispatcherType::toJakartaDispatcherType)
+                                    .collect(Collectors.toSet())),
+                            isMatchAfter,
+                            servletNames);
+                }
+
+                @Override
+                public Collection<String> getServletNameMappings() {
+                    return from.getServletNameMappings();
+                }
+
+                @Override
+                public void addMappingForUrlPatterns(
+                        EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, String... urlPatterns) {
+                    from.addMappingForUrlPatterns(
+                            EnumSet.copyOf(dispatcherTypes.stream()
+                                    .map(DispatcherType::toJakartaDispatcherType)
+                                    .collect(Collectors.toSet())),
+                            isMatchAfter,
+                            urlPatterns);
+                }
+
+                @Override
+                public Collection<String> getUrlPatternMappings() {
+                    return from.getUrlPatternMappings();
+                }
+
+                @Override
+                public jakarta.servlet.Registration toJakartaRegistration() {
+                    return from;
+                }
+
+                @Override
+                public jakarta.servlet.Registration.Dynamic toJakartaRegistrationDynamic() {
+                    return from;
+                }
+
+                @Override
+                public jakarta.servlet.FilterRegistration toJakartaFilterRegistration() {
+                    return from;
+                }
+
+                @Override
+                public jakarta.servlet.FilterRegistration.Dynamic toJakartaFilterRegistrationDynamic() {
+                    return from;
+                }
+            };
+        }
+    }
+
+    default jakarta.servlet.FilterRegistration toJakartaFilterRegistration() {
+        return new jakarta.servlet.FilterRegistration() {
+            @Override
+            public String getName() {
+                return FilterRegistration.this.getName();
+            }
+
+            @Override
+            public String getClassName() {
+                return FilterRegistration.this.getClassName();
+            }
+
+            @Override
+            public boolean setInitParameter(String name, String value) {
+                return FilterRegistration.this.setInitParameter(name, value);
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return FilterRegistration.this.getInitParameter(name);
+            }
+
+            @Override
+            public Set<String> setInitParameters(Map<String, String> initParameters) {
+                return FilterRegistration.this.setInitParameters(initParameters);
+            }
+
+            @Override
+            public Map<String, String> getInitParameters() {
+                return FilterRegistration.this.getInitParameters();
+            }
+
+            @Override
+            public void addMappingForServletNames(
+                    EnumSet<jakarta.servlet.DispatcherType> dispatcherTypes,
+                    boolean isMatchAfter,
+                    String... servletNames) {
+                FilterRegistration.this.addMappingForServletNames(
+                        EnumSet.copyOf(dispatcherTypes.stream()
+                                .map(DispatcherType::fromJakartaDispatcherType)
+                                .collect(Collectors.toSet())),
+                        isMatchAfter,
+                        servletNames);
+            }
+
+            @Override
+            public Collection<String> getServletNameMappings() {
+                return FilterRegistration.this.getServletNameMappings();
+            }
+
+            @Override
+            public void addMappingForUrlPatterns(
+                    EnumSet<jakarta.servlet.DispatcherType> dispatcherTypes,
+                    boolean isMatchAfter,
+                    String... urlPatterns) {
+                FilterRegistration.this.addMappingForUrlPatterns(
+                        EnumSet.copyOf(dispatcherTypes.stream()
+                                .map(DispatcherType::fromJakartaDispatcherType)
+                                .collect(Collectors.toSet())),
+                        isMatchAfter,
+                        urlPatterns);
+            }
+
+            @Override
+            public Collection<String> getUrlPatternMappings() {
+                return FilterRegistration.this.getUrlPatternMappings();
+            }
+        };
+    }
+
+    static FilterRegistration fromJakartaFilterRegistration(jakarta.servlet.FilterRegistration from) {
+        return new FilterRegistration() {
+            @Override
+            public String getName() {
+                return from.getName();
+            }
+
+            @Override
+            public String getClassName() {
+                return from.getClassName();
+            }
+
+            @Override
+            public boolean setInitParameter(String name, String value) {
+                return from.setInitParameter(name, value);
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return from.getInitParameter(name);
+            }
+
+            @Override
+            public Set<String> setInitParameters(Map<String, String> initParameters) {
+                return from.setInitParameters(initParameters);
+            }
+
+            @Override
+            public Map<String, String> getInitParameters() {
+                return from.getInitParameters();
+            }
+
+            @Override
+            public void addMappingForServletNames(
+                    EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, String... servletNames) {
+                from.addMappingForServletNames(
+                        EnumSet.copyOf(dispatcherTypes.stream()
+                                .map(DispatcherType::toJakartaDispatcherType)
+                                .collect(Collectors.toSet())),
+                        isMatchAfter,
+                        servletNames);
+            }
+
+            @Override
+            public Collection<String> getServletNameMappings() {
+                return from.getServletNameMappings();
+            }
+
+            @Override
+            public void addMappingForUrlPatterns(
+                    EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, String... urlPatterns) {
+                from.addMappingForUrlPatterns(
+                        EnumSet.copyOf(dispatcherTypes.stream()
+                                .map(DispatcherType::toJakartaDispatcherType)
+                                .collect(Collectors.toSet())),
+                        isMatchAfter,
+                        urlPatterns);
+            }
+
+            @Override
+            public Collection<String> getUrlPatternMappings() {
+                return from.getUrlPatternMappings();
+            }
+
+            @Override
+            public jakarta.servlet.Registration toJakartaRegistration() {
+                return from;
+            }
+
+            @Override
+            public jakarta.servlet.FilterRegistration toJakartaFilterRegistration() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/GenericFilter.java b/core/src/main/java/javax/servlet/GenericFilter.java
new file mode 100644
index 0000000000..a92fa8a337
--- /dev/null
+++ b/core/src/main/java/javax/servlet/GenericFilter.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import java.util.Enumeration;
+import java.util.ResourceBundle;
+
+public abstract class GenericFilter implements Filter, FilterConfig, java.io.Serializable {
+    private static final long serialVersionUID = 4060116231031076581L;
+
+    private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
+    private static final ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE);
+
+    private transient FilterConfig config;
+
+    public GenericFilter() {}
+
+    @Override
+    public String getInitParameter(String name) {
+        FilterConfig fc = getFilterConfig();
+        if (fc == null) {
+            throw new IllegalStateException(lStrings.getString("err.filter_config_not_initialized"));
+        }
+
+        return fc.getInitParameter(name);
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        FilterConfig fc = getFilterConfig();
+        if (fc == null) {
+            throw new IllegalStateException(lStrings.getString("err.filter_config_not_initialized"));
+        }
+
+        return fc.getInitParameterNames();
+    }
+
+    public FilterConfig getFilterConfig() {
+        return config;
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        FilterConfig sc = getFilterConfig();
+        if (sc == null) {
+            throw new IllegalStateException(lStrings.getString("err.filter_config_not_initialized"));
+        }
+
+        return sc.getServletContext();
+    }
+
+    @Override
+    public void init(FilterConfig config) throws ServletException {
+        this.config = config;
+        this.init();
+    }
+
+    public void init() throws ServletException {}
+
+    @Override
+    public String getFilterName() {
+        FilterConfig sc = getFilterConfig();
+        if (sc == null) {
+            throw new IllegalStateException(lStrings.getString("err.servlet_config_not_initialized"));
+        }
+
+        return sc.getFilterName();
+    }
+}
diff --git a/core/src/main/java/javax/servlet/GenericServlet.java b/core/src/main/java/javax/servlet/GenericServlet.java
new file mode 100644
index 0000000000..28ad2c8aa2
--- /dev/null
+++ b/core/src/main/java/javax/servlet/GenericServlet.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.ResourceBundle;
+
+public abstract class GenericServlet implements Servlet, ServletConfig, java.io.Serializable {
+    private static final long serialVersionUID = -8592279577370996712L;
+
+    private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
+    private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE);
+
+    private transient ServletConfig config;
+
+    public GenericServlet() {}
+
+    @Override
+    public void destroy() {}
+
+    @Override
+    public String getInitParameter(String name) {
+        ServletConfig sc = getServletConfig();
+        if (sc == null) {
+            throw new IllegalStateException(lStrings.getString("err.servlet_config_not_initialized"));
+        }
+
+        return sc.getInitParameter(name);
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        ServletConfig sc = getServletConfig();
+        if (sc == null) {
+            throw new IllegalStateException(lStrings.getString("err.servlet_config_not_initialized"));
+        }
+
+        return sc.getInitParameterNames();
+    }
+
+    @Override
+    public ServletConfig getServletConfig() {
+        return config;
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        ServletConfig sc = getServletConfig();
+        if (sc == null) {
+            throw new IllegalStateException(lStrings.getString("err.servlet_config_not_initialized"));
+        }
+
+        return sc.getServletContext();
+    }
+
+    @Override
+    public String getServletInfo() {
+        return "";
+    }
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        this.config = config;
+        this.init();
+    }
+
+    public void init() throws ServletException {}
+
+    public void log(String msg) {
+        getServletContext().log(getServletName() + ": " + msg);
+    }
+
+    public void log(String message, Throwable t) {
+        getServletContext().log(getServletName() + ": " + message, t);
+    }
+
+    @Override
+    public abstract void service(ServletRequest req, ServletResponse res) throws ServletException, IOException;
+
+    @Override
+    public String getServletName() {
+        ServletConfig sc = getServletConfig();
+        if (sc == null) {
+            throw new IllegalStateException(lStrings.getString("err.servlet_config_not_initialized"));
+        }
+
+        return sc.getServletName();
+    }
+}
diff --git a/core/src/main/java/javax/servlet/HttpConstraintElement.java b/core/src/main/java/javax/servlet/HttpConstraintElement.java
new file mode 100644
index 0000000000..5fe22de746
--- /dev/null
+++ b/core/src/main/java/javax/servlet/HttpConstraintElement.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
+import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
+
+public class HttpConstraintElement {
+    private EmptyRoleSemantic emptyRoleSemantic;
+    private TransportGuarantee transportGuarantee;
+    private String[] rolesAllowed;
+
+    public HttpConstraintElement() {
+        this(EmptyRoleSemantic.PERMIT);
+    }
+
+    public HttpConstraintElement(EmptyRoleSemantic semantic) {
+        this(semantic, TransportGuarantee.NONE, new String[0]);
+    }
+
+    public HttpConstraintElement(TransportGuarantee guarantee, String... roleNames) {
+        this(EmptyRoleSemantic.PERMIT, guarantee, roleNames);
+    }
+
+    public HttpConstraintElement(EmptyRoleSemantic semantic, TransportGuarantee guarantee, String... roleNames) {
+        if (semantic == EmptyRoleSemantic.DENY && roleNames.length > 0) {
+            throw new IllegalArgumentException("Deny semantic with rolesAllowed");
+        }
+        this.emptyRoleSemantic = semantic;
+        this.transportGuarantee = guarantee;
+        this.rolesAllowed = copyStrings(roleNames);
+    }
+
+    public EmptyRoleSemantic getEmptyRoleSemantic() {
+        return this.emptyRoleSemantic;
+    }
+
+    public TransportGuarantee getTransportGuarantee() {
+        return this.transportGuarantee;
+    }
+
+    public String[] getRolesAllowed() {
+        return copyStrings(this.rolesAllowed);
+    }
+
+    private String[] copyStrings(String[] strings) {
+        String[] arr = null;
+        if (strings != null) {
+            int len = strings.length;
+            arr = new String[len];
+            if (len > 0) {
+                System.arraycopy(strings, 0, arr, 0, len);
+            }
+        }
+
+        return ((arr != null) ? arr : new String[0]);
+    }
+}
diff --git a/core/src/main/java/javax/servlet/HttpMethodConstraintElement.java b/core/src/main/java/javax/servlet/HttpMethodConstraintElement.java
new file mode 100644
index 0000000000..1a1726a936
--- /dev/null
+++ b/core/src/main/java/javax/servlet/HttpMethodConstraintElement.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+public class HttpMethodConstraintElement extends HttpConstraintElement {
+    private String methodName;
+
+    public HttpMethodConstraintElement(String methodName) {
+        if (methodName == null || methodName.length() == 0) {
+            throw new IllegalArgumentException("invalid HTTP method name");
+        }
+        this.methodName = methodName;
+    }
+
+    public HttpMethodConstraintElement(String methodName, HttpConstraintElement constraint) {
+        super(constraint.getEmptyRoleSemantic(), constraint.getTransportGuarantee(), constraint.getRolesAllowed());
+        if (methodName == null || methodName.length() == 0) {
+            throw new IllegalArgumentException("invalid HTTP method name");
+        }
+        this.methodName = methodName;
+    }
+
+    public String getMethodName() {
+        return this.methodName;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/MultipartConfigElement.java b/core/src/main/java/javax/servlet/MultipartConfigElement.java
new file mode 100644
index 0000000000..9c1fde738a
--- /dev/null
+++ b/core/src/main/java/javax/servlet/MultipartConfigElement.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import javax.servlet.annotation.MultipartConfig;
+
+public class MultipartConfigElement {
+    private String location;
+    private long maxFileSize;
+    private long maxRequestSize;
+    private int fileSizeThreshold;
+
+    public MultipartConfigElement(String location) {
+        if (location == null) {
+            this.location = "";
+        } else {
+            this.location = location;
+        }
+        this.maxFileSize = -1L;
+        this.maxRequestSize = -1L;
+        this.fileSizeThreshold = 0;
+    }
+
+    public MultipartConfigElement(String location, long maxFileSize, long maxRequestSize, int fileSizeThreshold) {
+        if (location == null) {
+            this.location = "";
+        } else {
+            this.location = location;
+        }
+        this.maxFileSize = maxFileSize;
+        this.maxRequestSize = maxRequestSize;
+        this.fileSizeThreshold = fileSizeThreshold;
+    }
+
+    public MultipartConfigElement(MultipartConfig annotation) {
+        this.location = annotation.location();
+        this.fileSizeThreshold = annotation.fileSizeThreshold();
+        this.maxFileSize = annotation.maxFileSize();
+        this.maxRequestSize = annotation.maxRequestSize();
+    }
+
+    public String getLocation() {
+        return this.location;
+    }
+
+    public long getMaxFileSize() {
+        return this.maxFileSize;
+    }
+
+    public long getMaxRequestSize() {
+        return this.maxRequestSize;
+    }
+
+    public int getFileSizeThreshold() {
+        return this.fileSizeThreshold;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ReadListener.java b/core/src/main/java/javax/servlet/ReadListener.java
new file mode 100644
index 0000000000..11ce3bc45d
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ReadListener.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import java.io.IOException;
+import java.util.EventListener;
+
+public interface ReadListener extends EventListener {
+    void onDataAvailable() throws IOException;
+
+    void onAllDataRead() throws IOException;
+
+    void onError(Throwable t);
+
+    default jakarta.servlet.ReadListener toJakartaReadListener() {
+        return new jakarta.servlet.ReadListener() {
+            @Override
+            public void onDataAvailable() throws IOException {
+                ReadListener.this.onDataAvailable();
+            }
+
+            @Override
+            public void onAllDataRead() throws IOException {
+                ReadListener.this.onAllDataRead();
+            }
+
+            @Override
+            public void onError(Throwable throwable) {
+                ReadListener.this.onError(throwable);
+            }
+        };
+    }
+
+    static ReadListener fromJakartaReadListener(jakarta.servlet.ReadListener from) {
+        return new ReadListener() {
+            @Override
+            public void onDataAvailable() throws IOException {
+                from.onDataAvailable();
+            }
+
+            @Override
+            public void onAllDataRead() throws IOException {
+                from.onAllDataRead();
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                from.onError(t);
+            }
+
+            @Override
+            public jakarta.servlet.ReadListener toJakartaReadListener() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/Registration.java b/core/src/main/java/javax/servlet/Registration.java
new file mode 100644
index 0000000000..80eeac2589
--- /dev/null
+++ b/core/src/main/java/javax/servlet/Registration.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import java.util.Map;
+import java.util.Set;
+
+public interface Registration {
+    String getName();
+
+    String getClassName();
+
+    boolean setInitParameter(String name, String value);
+
+    String getInitParameter(String name);
+
+    Set<String> setInitParameters(Map<String, String> initParameters);
+
+    Map<String, String> getInitParameters();
+
+    interface Dynamic extends Registration {
+        void setAsyncSupported(boolean isAsyncSupported);
+
+        default jakarta.servlet.Registration.Dynamic toJakartaRegistrationDynamic() {
+            return new jakarta.servlet.Registration.Dynamic() {
+                @Override
+                public String getName() {
+                    return Registration.Dynamic.this.getName();
+                }
+
+                @Override
+                public String getClassName() {
+                    return Registration.Dynamic.this.getClassName();
+                }
+
+                @Override
+                public boolean setInitParameter(String name, String value) {
+                    return Registration.Dynamic.this.setInitParameter(name, value);
+                }
+
+                @Override
+                public String getInitParameter(String name) {
+                    return Registration.Dynamic.this.getInitParameter(name);
+                }
+
+                @Override
+                public Set<String> setInitParameters(Map<String, String> initParameters) {
+                    return Registration.Dynamic.this.setInitParameters(initParameters);
+                }
+
+                @Override
+                public Map<String, String> getInitParameters() {
+                    return Registration.Dynamic.this.getInitParameters();
+                }
+
+                @Override
+                public void setAsyncSupported(boolean isAsyncSupported) {
+                    Registration.Dynamic.this.setAsyncSupported(isAsyncSupported);
+                }
+            };
+        }
+
+        static Registration.Dynamic fromJakartaRegistrationDynamic(jakarta.servlet.Registration.Dynamic from) {
+            return new Registration.Dynamic() {
+                @Override
+                public String getName() {
+                    return from.getName();
+                }
+
+                @Override
+                public String getClassName() {
+                    return from.getClassName();
+                }
+
+                @Override
+                public boolean setInitParameter(String name, String value) {
+                    return from.setInitParameter(name, value);
+                }
+
+                @Override
+                public String getInitParameter(String name) {
+                    return from.getInitParameter(name);
+                }
+
+                @Override
+                public Set<String> setInitParameters(Map<String, String> initParameters) {
+                    return from.setInitParameters(initParameters);
+                }
+
+                @Override
+                public Map<String, String> getInitParameters() {
+                    return from.getInitParameters();
+                }
+
+                @Override
+                public void setAsyncSupported(boolean isAsyncSupported) {
+                    from.setAsyncSupported(isAsyncSupported);
+                }
+
+                @Override
+                public jakarta.servlet.Registration toJakartaRegistration() {
+                    return from;
+                }
+
+                @Override
+                public jakarta.servlet.Registration.Dynamic toJakartaRegistrationDynamic() {
+                    return from;
+                }
+            };
+        }
+    }
+
+    default jakarta.servlet.Registration toJakartaRegistration() {
+        return new jakarta.servlet.Registration() {
+            @Override
+            public String getName() {
+                return Registration.this.getName();
+            }
+
+            @Override
+            public String getClassName() {
+                return Registration.this.getClassName();
+            }
+
+            @Override
+            public boolean setInitParameter(String name, String value) {
+                return Registration.this.setInitParameter(name, value);
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return Registration.this.getInitParameter(name);
+            }
+
+            @Override
+            public Set<String> setInitParameters(Map<String, String> initParameters) {
+                return Registration.this.setInitParameters(initParameters);
+            }
+
+            @Override
+            public Map<String, String> getInitParameters() {
+                return Registration.this.getInitParameters();
+            }
+        };
+    }
+
+    static Registration fromJakartaRegistration(jakarta.servlet.Registration from) {
+        return new Registration() {
+            @Override
+            public String getName() {
+                return from.getName();
+            }
+
+            @Override
+            public String getClassName() {
+                return from.getClassName();
+            }
+
+            @Override
+            public boolean setInitParameter(String name, String value) {
+                return from.setInitParameter(name, value);
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return from.getInitParameter(name);
+            }
+
+            @Override
+            public Set<String> setInitParameters(Map<String, String> initParameters) {
+                return from.setInitParameters(initParameters);
+            }
+
+            @Override
+            public Map<String, String> getInitParameters() {
+                return from.getInitParameters();
+            }
+
+            @Override
+            public jakarta.servlet.Registration toJakartaRegistration() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/RequestDispatcher.java b/core/src/main/java/javax/servlet/RequestDispatcher.java
new file mode 100644
index 0000000000..a6bb2edba9
--- /dev/null
+++ b/core/src/main/java/javax/servlet/RequestDispatcher.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressFBWarnings(value = "REQUESTDISPATCHER_FILE_DISCLOSURE", justification = "TODO needs triage")
+public interface RequestDispatcher {
+    String FORWARD_REQUEST_URI = "javax.servlet.forward.request_uri";
+
+    String FORWARD_CONTEXT_PATH = "javax.servlet.forward.context_path";
+
+    String FORWARD_MAPPING = "javax.servlet.forward.mapping";
+
+    String FORWARD_PATH_INFO = "javax.servlet.forward.path_info";
+
+    String FORWARD_SERVLET_PATH = "javax.servlet.forward.servlet_path";
+
+    String FORWARD_QUERY_STRING = "javax.servlet.forward.query_string";
+
+    String INCLUDE_REQUEST_URI = "javax.servlet.include.request_uri";
+
+    String INCLUDE_CONTEXT_PATH = "javax.servlet.include.context_path";
+
+    String INCLUDE_PATH_INFO = "javax.servlet.include.path_info";
+
+    String INCLUDE_MAPPING = "javax.servlet.include.mapping";
+
+    String INCLUDE_SERVLET_PATH = "javax.servlet.include.servlet_path";
+
+    String INCLUDE_QUERY_STRING = "javax.servlet.include.query_string";
+
+    String ERROR_EXCEPTION = "javax.servlet.error.exception";
+
+    String ERROR_EXCEPTION_TYPE = "javax.servlet.error.exception_type";
+
+    String ERROR_MESSAGE = "javax.servlet.error.message";
+
+    String ERROR_REQUEST_URI = "javax.servlet.error.request_uri";
+
+    String ERROR_SERVLET_NAME = "javax.servlet.error.servlet_name";
+
+    String ERROR_STATUS_CODE = "javax.servlet.error.status_code";
+
+    void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException;
+
+    void include(ServletRequest request, ServletResponse response) throws ServletException, IOException;
+
+    default jakarta.servlet.RequestDispatcher toJakartaRequestDispatcher() {
+        return new jakarta.servlet.RequestDispatcher() {
+            @Override
+            public void forward(jakarta.servlet.ServletRequest request, jakarta.servlet.ServletResponse response)
+                    throws jakarta.servlet.ServletException, IOException {
+                try {
+                    if (request instanceof jakarta.servlet.http.HttpServletRequest
+                            && response instanceof jakarta.servlet.http.HttpServletResponse) {
+                        jakarta.servlet.http.HttpServletRequest httpRequest =
+                                (jakarta.servlet.http.HttpServletRequest) request;
+                        jakarta.servlet.http.HttpServletResponse httpResponse =
+                                (jakarta.servlet.http.HttpServletResponse) response;
+                        RequestDispatcher.this.forward(
+                                HttpServletRequest.fromJakartaHttpServletRequest(httpRequest),
+                                HttpServletResponse.fromJakartaHttpServletResponse(httpResponse));
+                    } else {
+                        RequestDispatcher.this.forward(
+                                ServletRequest.fromJakartaServletRequest(request),
+                                ServletResponse.fromJakartaServletResponse(response));
+                    }
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+
+            @Override
+            public void include(jakarta.servlet.ServletRequest request, jakarta.servlet.ServletResponse response)
+                    throws jakarta.servlet.ServletException, IOException {
+                try {
+                    if (request instanceof jakarta.servlet.http.HttpServletRequest
+                            && response instanceof jakarta.servlet.http.HttpServletResponse) {
+                        jakarta.servlet.http.HttpServletRequest httpRequest =
+                                (jakarta.servlet.http.HttpServletRequest) request;
+                        jakarta.servlet.http.HttpServletResponse httpResponse =
+                                (jakarta.servlet.http.HttpServletResponse) response;
+                        RequestDispatcher.this.include(
+                                HttpServletRequest.fromJakartaHttpServletRequest(httpRequest),
+                                HttpServletResponse.fromJakartaHttpServletResponse(httpResponse));
+                    } else {
+                        RequestDispatcher.this.include(
+                                ServletRequest.fromJakartaServletRequest(request),
+                                ServletResponse.fromJakartaServletResponse(response));
+                    }
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+        };
+    }
+
+    static RequestDispatcher fromJakartaRequestDispatcher(jakarta.servlet.RequestDispatcher from) {
+        return new RequestDispatcher() {
+            @Override
+            public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException {
+                try {
+                    if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) {
+                        HttpServletRequest httpRequest = (HttpServletRequest) request;
+                        HttpServletResponse httpResponse = (HttpServletResponse) response;
+                        from.forward(
+                                httpRequest.toJakartaHttpServletRequest(), httpResponse.toJakartaHttpServletResponse());
+                    } else {
+                        from.forward(request.toJakartaServletRequest(), response.toJakartaServletResponse());
+                    }
+                } catch (jakarta.servlet.ServletException e) {
+                    throw new ServletException(e);
+                }
+            }
+
+            @Override
+            public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException {
+                try {
+                    if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) {
+                        HttpServletRequest httpRequest = (HttpServletRequest) request;
+                        HttpServletResponse httpResponse = (HttpServletResponse) response;
+                        from.include(
+                                httpRequest.toJakartaHttpServletRequest(), httpResponse.toJakartaHttpServletResponse());
+                    } else {
+                        from.include(request.toJakartaServletRequest(), response.toJakartaServletResponse());
+                    }
+                } catch (jakarta.servlet.ServletException e) {
+                    throw new ServletException(e);
+                }
+            }
+
+            @Override
+            public jakarta.servlet.RequestDispatcher toJakartaRequestDispatcher() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/Servlet.java b/core/src/main/java/javax/servlet/Servlet.java
new file mode 100644
index 0000000000..4884d15bfb
--- /dev/null
+++ b/core/src/main/java/javax/servlet/Servlet.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public interface Servlet {
+    void init(ServletConfig config) throws ServletException;
+
+    ServletConfig getServletConfig();
+
+    void service(ServletRequest req, ServletResponse res) throws ServletException, IOException;
+
+    String getServletInfo();
+
+    void destroy();
+
+    default jakarta.servlet.Servlet toJakartaServlet() {
+        return new jakarta.servlet.Servlet() {
+            @Override
+            public void init(jakarta.servlet.ServletConfig config) throws jakarta.servlet.ServletException {
+                try {
+                    Servlet.this.init(ServletConfig.fromJakartaServletConfig(config));
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+
+            @Override
+            public jakarta.servlet.ServletConfig getServletConfig() {
+                return Servlet.this.getServletConfig().toJakartaServletConfig();
+            }
+
+            @Override
+            public void service(jakarta.servlet.ServletRequest request, jakarta.servlet.ServletResponse response)
+                    throws jakarta.servlet.ServletException, IOException {
+                try {
+                    if (request instanceof jakarta.servlet.http.HttpServletRequest
+                            && response instanceof jakarta.servlet.http.HttpServletResponse) {
+                        jakarta.servlet.http.HttpServletRequest httpRequest =
+                                (jakarta.servlet.http.HttpServletRequest) request;
+                        jakarta.servlet.http.HttpServletResponse httpResponse =
+                                (jakarta.servlet.http.HttpServletResponse) response;
+                        Servlet.this.service(
+                                HttpServletRequest.fromJakartaHttpServletRequest(httpRequest),
+                                HttpServletResponse.fromJakartaHttpServletResponse(httpResponse));
+                    } else {
+                        Servlet.this.service(
+                                ServletRequest.fromJakartaServletRequest(request),
+                                ServletResponse.fromJakartaServletResponse(response));
+                    }
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+
+            @Override
+            public String getServletInfo() {
+                return Servlet.this.getServletInfo();
+            }
+
+            @Override
+            public void destroy() {
+                Servlet.this.destroy();
+            }
+        };
+    }
+
+    static Servlet fromJakartaServlet(jakarta.servlet.Servlet from) {
+        return new Servlet() {
+            @Override
+            public void init(ServletConfig config) throws ServletException {
+                try {
+                    from.init(config.toJakartaServletConfig());
+                } catch (jakarta.servlet.ServletException e) {
+                    throw new ServletException(e);
+                }
+            }
+
+            @Override
+            public ServletConfig getServletConfig() {
+                return ServletConfig.fromJakartaServletConfig(from.getServletConfig());
+            }
+
+            @Override
+            public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
+                try {
+                    if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) {
+                        HttpServletRequest httpRequest = (HttpServletRequest) request;
+                        HttpServletResponse httpResponse = (HttpServletResponse) response;
+                        from.service(
+                                httpRequest.toJakartaHttpServletRequest(), httpResponse.toJakartaHttpServletResponse());
+                    } else {
+                        from.service(request.toJakartaServletRequest(), response.toJakartaServletResponse());
+                    }
+                } catch (jakarta.servlet.ServletException e) {
+                    throw new ServletException(e);
+                }
+            }
+
+            @Override
+            public String getServletInfo() {
+                return from.getServletInfo();
+            }
+
+            @Override
+            public void destroy() {
+                from.destroy();
+            }
+
+            @Override
+            public jakarta.servlet.Servlet toJakartaServlet() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletConfig.java b/core/src/main/java/javax/servlet/ServletConfig.java
new file mode 100644
index 0000000000..9d45a68810
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletConfig.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.util.Enumeration;
+
+public interface ServletConfig {
+    String getServletName();
+
+    ServletContext getServletContext();
+
+    String getInitParameter(String name);
+
+    Enumeration<String> getInitParameterNames();
+
+    default jakarta.servlet.ServletConfig toJakartaServletConfig() {
+        return new jakarta.servlet.ServletConfig() {
+            @Override
+            public String getServletName() {
+                return ServletConfig.this.getServletName();
+            }
+
+            @Override
+            public jakarta.servlet.ServletContext getServletContext() {
+                return ServletConfig.this.getServletContext().toJakartaServletContext();
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return ServletConfig.this.getInitParameter(name);
+            }
+
+            @Override
+            public Enumeration<String> getInitParameterNames() {
+                return ServletConfig.this.getInitParameterNames();
+            }
+        };
+    }
+
+    static ServletConfig fromJakartaServletConfig(jakarta.servlet.ServletConfig from) {
+        return new ServletConfig() {
+            @Override
+            public String getServletName() {
+                return from.getServletName();
+            }
+
+            @Override
+            public ServletContext getServletContext() {
+                return ServletContext.fromJakartServletContext(from.getServletContext());
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return from.getInitParameter(name);
+            }
+
+            @Override
+            public Enumeration<String> getInitParameterNames() {
+                return from.getInitParameterNames();
+            }
+
+            @Override
+            public jakarta.servlet.ServletConfig toJakartaServletConfig() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletContainerInitializer.java b/core/src/main/java/javax/servlet/ServletContainerInitializer.java
new file mode 100644
index 0000000000..7a502163a3
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletContainerInitializer.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import java.util.Set;
+
+public interface ServletContainerInitializer {
+    void onStartup(Set<Class<?>> c, ServletContext ctx) throws ServletException;
+}
diff --git a/core/src/main/java/javax/servlet/ServletContext.java b/core/src/main/java/javax/servlet/ServletContext.java
new file mode 100644
index 0000000000..ed7bc1d898
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletContext.java
@@ -0,0 +1,825 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.servlet.descriptor.JspConfigDescriptor;
+
+public interface ServletContext {
+    String TEMPDIR = "javax.servlet.context.tempdir";
+
+    String ORDERED_LIBS = "javax.servlet.context.orderedLibs";
+
+    String getContextPath();
+
+    ServletContext getContext(String uripath);
+
+    int getMajorVersion();
+
+    int getMinorVersion();
+
+    int getEffectiveMajorVersion();
+
+    int getEffectiveMinorVersion();
+
+    String getMimeType(String file);
+
+    Set<String> getResourcePaths(String path);
+
+    URL getResource(String path) throws MalformedURLException;
+
+    InputStream getResourceAsStream(String path);
+
+    RequestDispatcher getRequestDispatcher(String path);
+
+    RequestDispatcher getNamedDispatcher(String name);
+
+    @Deprecated
+    Servlet getServlet(String name) throws ServletException;
+
+    @Deprecated
+    Enumeration<Servlet> getServlets();
+
+    @Deprecated
+    Enumeration<String> getServletNames();
+
+    void log(String msg);
+
+    @Deprecated
+    void log(Exception exception, String msg);
+
+    void log(String message, Throwable throwable);
+
+    String getRealPath(String path);
+
+    String getServerInfo();
+
+    String getInitParameter(String name);
+
+    Enumeration<String> getInitParameterNames();
+
+    boolean setInitParameter(String name, String value);
+
+    Object getAttribute(String name);
+
+    Enumeration<String> getAttributeNames();
+
+    void setAttribute(String name, Object object);
+
+    void removeAttribute(String name);
+
+    String getServletContextName();
+
+    ServletRegistration.Dynamic addServlet(String servletName, String className);
+
+    ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet);
+
+    ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass);
+
+    ServletRegistration.Dynamic addJspFile(String servletName, String jspFile);
+
+    <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException;
+
+    ServletRegistration getServletRegistration(String servletName);
+
+    Map<String, ? extends ServletRegistration> getServletRegistrations();
+
+    FilterRegistration.Dynamic addFilter(String filterName, String className);
+
+    FilterRegistration.Dynamic addFilter(String filterName, Filter filter);
+
+    FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass);
+
+    <T extends Filter> T createFilter(Class<T> clazz) throws ServletException;
+
+    FilterRegistration getFilterRegistration(String filterName);
+
+    Map<String, ? extends FilterRegistration> getFilterRegistrations();
+
+    SessionCookieConfig getSessionCookieConfig();
+
+    void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes);
+
+    Set<SessionTrackingMode> getDefaultSessionTrackingModes();
+
+    Set<SessionTrackingMode> getEffectiveSessionTrackingModes();
+
+    void addListener(String className);
+
+    <T extends EventListener> void addListener(T t);
+
+    void addListener(Class<? extends EventListener> listenerClass);
+
+    <T extends EventListener> T createListener(Class<T> clazz) throws ServletException;
+
+    JspConfigDescriptor getJspConfigDescriptor();
+
+    ClassLoader getClassLoader();
+
+    void declareRoles(String... roleNames);
+
+    String getVirtualServerName();
+
+    int getSessionTimeout();
+
+    void setSessionTimeout(int sessionTimeout);
+
+    String getRequestCharacterEncoding();
+
+    void setRequestCharacterEncoding(String encoding);
+
+    String getResponseCharacterEncoding();
+
+    void setResponseCharacterEncoding(String encoding);
+
+    default jakarta.servlet.ServletContext toJakartaServletContext() {
+        return new jakarta.servlet.ServletContext() {
+            @Override
+            public String getContextPath() {
+                return ServletContext.this.getContextPath();
+            }
+
+            @Override
+            public jakarta.servlet.ServletContext getContext(String uripath) {
+                return ServletContext.this.getContext(uripath).toJakartaServletContext();
+            }
+
+            @Override
+            public int getMajorVersion() {
+                return ServletContext.this.getMajorVersion();
+            }
+
+            @Override
+            public int getMinorVersion() {
+                return ServletContext.this.getMinorVersion();
+            }
+
+            @Override
+            public int getEffectiveMajorVersion() {
+                return ServletContext.this.getEffectiveMajorVersion();
+            }
+
+            @Override
+            public int getEffectiveMinorVersion() {
+                return ServletContext.this.getEffectiveMinorVersion();
+            }
+
+            @Override
+            public String getMimeType(String file) {
+                return ServletContext.this.getMimeType(file);
+            }
+
+            @Override
+            public Set<String> getResourcePaths(String paths) {
+                return ServletContext.this.getResourcePaths(paths);
+            }
+
+            @Override
+            public URL getResource(String path) throws MalformedURLException {
+                return ServletContext.this.getResource(path);
+            }
+
+            @Override
+            public InputStream getResourceAsStream(String path) {
+                return ServletContext.this.getResourceAsStream(path);
+            }
+
+            @Override
+            public jakarta.servlet.RequestDispatcher getRequestDispatcher(String path) {
+                return ServletContext.this.getRequestDispatcher(path).toJakartaRequestDispatcher();
+            }
+
+            @Override
+            public jakarta.servlet.RequestDispatcher getNamedDispatcher(String path) {
+                return ServletContext.this.getNamedDispatcher(path).toJakartaRequestDispatcher();
+            }
+
+            @Override
+            public jakarta.servlet.Servlet getServlet(String name) throws jakarta.servlet.ServletException {
+                try {
+                    return ServletContext.this.getServlet(name).toJakartaServlet();
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+
+            @Override
+            public Enumeration<jakarta.servlet.Servlet> getServlets() {
+                return Collections.enumeration(Collections.list(ServletContext.this.getServlets()).stream()
+                        .map(Servlet::toJakartaServlet)
+                        .collect(Collectors.toList()));
+            }
+
+            @Override
+            public Enumeration<String> getServletNames() {
+                return ServletContext.this.getServletNames();
+            }
+
+            @Override
+            public void log(String msg) {
+                ServletContext.this.log(msg);
+            }
+
+            @Override
+            public void log(Exception exception, String msg) {
+                ServletContext.this.log(exception, msg);
+            }
+
+            @Override
+            public void log(String message, Throwable throwable) {
+                ServletContext.this.log(message, throwable);
+            }
+
+            @Override
+            public String getRealPath(String path) {
+                return ServletContext.this.getRealPath(path);
+            }
+
+            @Override
+            public String getServerInfo() {
+                return ServletContext.this.getServerInfo();
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return ServletContext.this.getInitParameter(name);
+            }
+
+            @Override
+            public Enumeration<String> getInitParameterNames() {
+                return ServletContext.this.getInitParameterNames();
+            }
+
+            @Override
+            public boolean setInitParameter(String name, String value) {
+                return ServletContext.this.setInitParameter(name, value);
+            }
+
+            @Override
+            public Object getAttribute(String name) {
+                return ServletContext.this.getAttribute(name);
+            }
+
+            @Override
+            public Enumeration<String> getAttributeNames() {
+                return ServletContext.this.getAttributeNames();
+            }
+
+            @Override
+            public void setAttribute(String name, Object object) {
+                ServletContext.this.setAttribute(name, object);
+            }
+
+            @Override
+            public void removeAttribute(String name) {
+                ServletContext.this.removeAttribute(name);
+            }
+
+            @Override
+            public String getServletContextName() {
+                return ServletContext.this.getServletContextName();
+            }
+
+            @Override
+            public jakarta.servlet.ServletRegistration.Dynamic addServlet(String servletName, String className) {
+                return ServletContext.this.addServlet(servletName, className).toJakartaServletRegistrationDynamic();
+            }
+
+            @Override
+            public jakarta.servlet.ServletRegistration.Dynamic addServlet(
+                    String servletName, jakarta.servlet.Servlet servlet) {
+                return ServletContext.this
+                        .addServlet(servletName, Servlet.fromJakartaServlet(servlet))
+                        .toJakartaServletRegistrationDynamic();
+            }
+
+            @Override
+            public jakarta.servlet.ServletRegistration.Dynamic addServlet(
+                    String servletName, Class<? extends jakarta.servlet.Servlet> servletClass) {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public jakarta.servlet.ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {
+                return ServletContext.this.addJspFile(servletName, jspFile).toJakartaServletRegistrationDynamic();
+            }
+
+            @Override
+            public <T extends jakarta.servlet.Servlet> T createServlet(Class<T> clazz)
+                    throws jakarta.servlet.ServletException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public jakarta.servlet.ServletRegistration getServletRegistration(String servletName) {
+                return ServletContext.this.getServletRegistration(servletName).toJakartaServletRegistration();
+            }
+
+            @Override
+            public Map<String, ? extends jakarta.servlet.ServletRegistration> getServletRegistrations() {
+                return ServletContext.this.getServletRegistrations().entrySet().stream()
+                        .collect(Collectors.toMap(
+                                Map.Entry::getKey, entry -> entry.getValue().toJakartaServletRegistration()));
+            }
+
+            @Override
+            public jakarta.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
+                return ServletContext.this.addFilter(filterName, className).toJakartaFilterRegistrationDynamic();
+            }
+
+            @Override
+            public jakarta.servlet.FilterRegistration.Dynamic addFilter(
+                    String filterName, jakarta.servlet.Filter filter) {
+                return ServletContext.this
+                        .addFilter(filterName, Filter.fromJakartaFilter(filter))
+                        .toJakartaFilterRegistrationDynamic();
+            }
+
+            @Override
+            public jakarta.servlet.FilterRegistration.Dynamic addFilter(
+                    String filterName, Class<? extends jakarta.servlet.Filter> filterClass) {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public <T extends jakarta.servlet.Filter> T createFilter(Class<T> clazz)
+                    throws jakarta.servlet.ServletException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public jakarta.servlet.FilterRegistration getFilterRegistration(String filterName) {
+                return ServletContext.this.getFilterRegistration(filterName).toJakartaFilterRegistration();
+            }
+
+            @Override
+            public Map<String, ? extends jakarta.servlet.FilterRegistration> getFilterRegistrations() {
+                return ServletContext.this.getFilterRegistrations().entrySet().stream()
+                        .collect(Collectors.toMap(
+                                Map.Entry::getKey, entry -> entry.getValue().toJakartaFilterRegistration()));
+            }
+
+            @Override
+            public jakarta.servlet.SessionCookieConfig getSessionCookieConfig() {
+                return ServletContext.this.getSessionCookieConfig().toJakartaSessionCookieConfig();
+            }
+
+            @Override
+            public void setSessionTrackingModes(Set<jakarta.servlet.SessionTrackingMode> sessionTrackingModes) {
+                ServletContext.this.setSessionTrackingModes(sessionTrackingModes.stream()
+                        .map(SessionTrackingMode::fromJakartaSessionTrackingMode)
+                        .collect(Collectors.toSet()));
+            }
+
+            @Override
+            public Set<jakarta.servlet.SessionTrackingMode> getDefaultSessionTrackingModes() {
+                return ServletContext.this.getDefaultSessionTrackingModes().stream()
+                        .map(SessionTrackingMode::toJakartaSessionTrackingMode)
+                        .collect(Collectors.toSet());
+            }
+
+            @Override
+            public Set<jakarta.servlet.SessionTrackingMode> getEffectiveSessionTrackingModes() {
+                return ServletContext.this.getEffectiveSessionTrackingModes().stream()
+                        .map(SessionTrackingMode::toJakartaSessionTrackingMode)
+                        .collect(Collectors.toSet());
+            }
+
+            @Override
+            public void addListener(String className) {
+                ServletContext.this.addListener(className);
+            }
+
+            @Override
+            public <T extends EventListener> void addListener(T t) {
+                ServletContext.this.addListener(t);
+            }
+
+            @Override
+            public void addListener(Class<? extends EventListener> listenerClass) {
+                ServletContext.this.addListener(listenerClass);
+            }
+
+            @Override
+            public <T extends EventListener> T createListener(Class<T> clazz) throws jakarta.servlet.ServletException {
+                try {
+                    return ServletContext.this.createListener(clazz);
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+
+            @Override
+            public jakarta.servlet.descriptor.JspConfigDescriptor getJspConfigDescriptor() {
+                return ServletContext.this.getJspConfigDescriptor().toJakartaJspConfigDescriptor();
+            }
+
+            @Override
+            public ClassLoader getClassLoader() {
+                return ServletContext.this.getClassLoader();
+            }
+
+            @Override
+            public void declareRoles(String... roleNames) {
+                ServletContext.this.declareRoles(roleNames);
+            }
+
+            @Override
+            public String getVirtualServerName() {
+                return ServletContext.this.getVirtualServerName();
+            }
+
+            @Override
+            public int getSessionTimeout() {
+                return ServletContext.this.getSessionTimeout();
+            }
+
+            @Override
+            public void setSessionTimeout(int sessionTimeout) {
+                ServletContext.this.setSessionTimeout(sessionTimeout);
+            }
+
+            @Override
+            public String getRequestCharacterEncoding() {
+                return ServletContext.this.getRequestCharacterEncoding();
+            }
+
+            @Override
+            public void setRequestCharacterEncoding(String encoding) {
+                ServletContext.this.setRequestCharacterEncoding(encoding);
+            }
+
+            @Override
+            public String getResponseCharacterEncoding() {
+                return ServletContext.this.getResponseCharacterEncoding();
+            }
+
+            @Override
+            public void setResponseCharacterEncoding(String encoding) {
+                ServletContext.this.setResponseCharacterEncoding(encoding);
+            }
+        };
+    }
+
+    static ServletContext fromJakartServletContext(jakarta.servlet.ServletContext from) {
+        return new ServletContext() {
+            @Override
+            public String getContextPath() {
+                return from.getContextPath();
+            }
+
+            @Override
+            public ServletContext getContext(String uripath) {
+                return ServletContext.fromJakartServletContext(from.getContext(uripath));
+            }
+
+            @Override
+            public int getMajorVersion() {
+                return from.getMajorVersion();
+            }
+
+            @Override
+            public int getMinorVersion() {
+                return from.getMinorVersion();
+            }
+
+            @Override
+            public int getEffectiveMajorVersion() {
+                return from.getEffectiveMajorVersion();
+            }
+
+            @Override
+            public int getEffectiveMinorVersion() {
+                return from.getEffectiveMinorVersion();
+            }
+
+            @Override
+            public String getMimeType(String file) {
+                return from.getMimeType(file);
+            }
+
+            @Override
+            public Set<String> getResourcePaths(String path) {
+                return from.getResourcePaths(path);
+            }
+
+            @Override
+            public URL getResource(String path) throws MalformedURLException {
+                return from.getResource(path);
+            }
+
+            @Override
+            public InputStream getResourceAsStream(String path) {
+                return from.getResourceAsStream(path);
+            }
+
+            @Override
+            public RequestDispatcher getRequestDispatcher(String path) {
+                return RequestDispatcher.fromJakartaRequestDispatcher(from.getRequestDispatcher(path));
+            }
+
+            @Override
+            public RequestDispatcher getNamedDispatcher(String name) {
+                return RequestDispatcher.fromJakartaRequestDispatcher(from.getNamedDispatcher(name));
+            }
+
+            @Override
+            public Servlet getServlet(String name) throws ServletException {
+                try {
+                    return Servlet.fromJakartaServlet(from.getServlet(name));
+                } catch (jakarta.servlet.ServletException e) {
+                    throw new ServletException(e);
+                }
+            }
+
+            @Override
+            public Enumeration<Servlet> getServlets() {
+                return Collections.enumeration(Collections.list(from.getServlets()).stream()
+                        .map(Servlet::fromJakartaServlet)
+                        .collect(Collectors.toList()));
+            }
+
+            @Override
+            public Enumeration<String> getServletNames() {
+                return from.getServletNames();
+            }
+
+            @Override
+            public void log(String msg) {
+                from.log(msg);
+            }
+
+            @Override
+            public void log(Exception exception, String msg) {
+                from.log(exception, msg);
+            }
+
+            @Override
+            public void log(String message, Throwable throwable) {
+                from.log(message, throwable);
+            }
+
+            @Override
+            public String getRealPath(String path) {
+                return from.getRealPath(path);
+            }
+
+            @Override
+            public String getServerInfo() {
+                return from.getServerInfo();
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return from.getInitParameter(name);
+            }
+
+            @Override
+            public Enumeration<String> getInitParameterNames() {
+                return from.getInitParameterNames();
+            }
+
+            @Override
+            public boolean setInitParameter(String name, String value) {
+                return from.setInitParameter(name, value);
+            }
+
+            @Override
+            public Object getAttribute(String name) {
+                return from.getAttribute(name);
+            }
+
+            @Override
+            public Enumeration<String> getAttributeNames() {
+                return from.getAttributeNames();
+            }
+
+            @Override
+            public void setAttribute(String name, Object object) {
+                from.setAttribute(name, object);
+            }
+
+            @Override
+            public void removeAttribute(String name) {
+                from.removeAttribute(name);
+            }
+
+            @Override
+            public String getServletContextName() {
+                return from.getServletContextName();
+            }
+
+            @Override
+            public ServletRegistration.Dynamic addServlet(String servletName, String className) {
+                return ServletRegistration.Dynamic.fromJakartaServletRegistrationDynamic(
+                        from.addServlet(servletName, className));
+            }
+
+            @Override
+            public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) {
+                return ServletRegistration.Dynamic.fromJakartaServletRegistrationDynamic(
+                        from.addServlet(servletName, servlet.toJakartaServlet()));
+            }
+
+            @Override
+            public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {
+                return ServletRegistration.Dynamic.fromJakartaServletRegistrationDynamic(
+                        from.addJspFile(servletName, jspFile));
+            }
+
+            @Override
+            public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public ServletRegistration getServletRegistration(String servletName) {
+                return ServletRegistration.fromJakartaServletRegistration(from.getServletRegistration(servletName));
+            }
+
+            @Override
+            public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+                return from.getServletRegistrations().entrySet().stream()
+                        .collect(Collectors.toMap(
+                                Map.Entry::getKey,
+                                entry -> ServletRegistration.fromJakartaServletRegistration(entry.getValue())));
+            }
+
+            @Override
+            public FilterRegistration.Dynamic addFilter(String filterName, String className) {
+                return FilterRegistration.Dynamic.fromJakartaFilterRegistrationDynamic(
+                        from.addFilter(filterName, className));
+            }
+
+            @Override
+            public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
+                return FilterRegistration.Dynamic.fromJakartaFilterRegistrationDynamic(
+                        from.addFilter(filterName, filter.toJakartaFilter()));
+            }
+
+            @Override
+            public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public FilterRegistration getFilterRegistration(String filterName) {
+                return FilterRegistration.fromJakartaFilterRegistration(from.getFilterRegistration(filterName));
+            }
+
+            @Override
+            public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+                return from.getFilterRegistrations().entrySet().stream()
+                        .collect(Collectors.toMap(
+                                Map.Entry::getKey,
+                                entry -> FilterRegistration.fromJakartaFilterRegistration(entry.getValue())));
+            }
+
+            @Override
+            public SessionCookieConfig getSessionCookieConfig() {
+                return SessionCookieConfig.fromJakartaSessionCookieConfig(from.getSessionCookieConfig());
+            }
+
+            @Override
+            public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
+                from.setSessionTrackingModes(sessionTrackingModes.stream()
+                        .map(SessionTrackingMode::toJakartaSessionTrackingMode)
+                        .collect(Collectors.toSet()));
+            }
+
+            @Override
+            public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+                return from.getDefaultSessionTrackingModes().stream()
+                        .map(SessionTrackingMode::fromJakartaSessionTrackingMode)
+                        .collect(Collectors.toSet());
+            }
+
+            @Override
+            public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+                return from.getEffectiveSessionTrackingModes().stream()
+                        .map(SessionTrackingMode::fromJakartaSessionTrackingMode)
+                        .collect(Collectors.toSet());
+            }
+
+            @Override
+            public void addListener(String className) {
+                from.addListener(className);
+            }
+
+            @Override
+            public <T extends EventListener> void addListener(T t) {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void addListener(Class<? extends EventListener> listenerClass) {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public JspConfigDescriptor getJspConfigDescriptor() {
+                return JspConfigDescriptor.fromJakartaJspConfigDescriptor(from.getJspConfigDescriptor());
+            }
+
+            @Override
+            public ClassLoader getClassLoader() {
+                return from.getClassLoader();
+            }
+
+            @Override
+            public void declareRoles(String... roleNames) {
+                from.declareRoles(roleNames);
+            }
+
+            @Override
+            public String getVirtualServerName() {
+                return from.getVirtualServerName();
+            }
+
+            @Override
+            public int getSessionTimeout() {
+                return from.getSessionTimeout();
+            }
+
+            @Override
+            public void setSessionTimeout(int sessionTimeout) {
+                from.setSessionTimeout(sessionTimeout);
+            }
+
+            @Override
+            public String getRequestCharacterEncoding() {
+                return from.getRequestCharacterEncoding();
+            }
+
+            @Override
+            public void setRequestCharacterEncoding(String encoding) {
+                from.setRequestCharacterEncoding(encoding);
+            }
+
+            @Override
+            public String getResponseCharacterEncoding() {
+                return from.getResponseCharacterEncoding();
+            }
+
+            @Override
+            public void setResponseCharacterEncoding(String encoding) {
+                from.setResponseCharacterEncoding(encoding);
+            }
+
+            @Override
+            public jakarta.servlet.ServletContext toJakartaServletContext() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletContextAttributeEvent.java b/core/src/main/java/javax/servlet/ServletContextAttributeEvent.java
new file mode 100644
index 0000000000..d5e5800749
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletContextAttributeEvent.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+public class ServletContextAttributeEvent extends ServletContextEvent {
+    private static final long serialVersionUID = -5804680734245618303L;
+
+    private String name;
+    private Object value;
+
+    public ServletContextAttributeEvent(ServletContext source, String name, Object value) {
+        super(source);
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public Object getValue() {
+        return this.value;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletContextAttributeListener.java b/core/src/main/java/javax/servlet/ServletContextAttributeListener.java
new file mode 100644
index 0000000000..610e970f10
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletContextAttributeListener.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.util.EventListener;
+
+public interface ServletContextAttributeListener extends EventListener {
+    default void attributeAdded(ServletContextAttributeEvent event) {}
+
+    default void attributeRemoved(ServletContextAttributeEvent event) {}
+
+    default void attributeReplaced(ServletContextAttributeEvent event) {}
+}
diff --git a/core/src/main/java/javax/servlet/ServletContextEvent.java b/core/src/main/java/javax/servlet/ServletContextEvent.java
new file mode 100644
index 0000000000..1990f1dd3b
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletContextEvent.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+public class ServletContextEvent extends java.util.EventObject {
+    private static final long serialVersionUID = -7501701636134222423L;
+
+    public ServletContextEvent(ServletContext source) {
+        super(source);
+    }
+
+    public ServletContext getServletContext() {
+        return (ServletContext) super.getSource();
+    }
+
+    jakarta.servlet.ServletContextEvent toJakartaServletContextEvent() {
+        return new jakarta.servlet.ServletContextEvent(getServletContext().toJakartaServletContext());
+    }
+
+    static ServletContextEvent fromJakartaServletContextEvent(jakarta.servlet.ServletContextEvent from) {
+        return new ServletContextEvent(ServletContext.fromJakartServletContext(from.getServletContext()));
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletContextListener.java b/core/src/main/java/javax/servlet/ServletContextListener.java
new file mode 100644
index 0000000000..ad997acb10
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletContextListener.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.util.EventListener;
+
+public interface ServletContextListener extends EventListener {
+    default void contextInitialized(ServletContextEvent sce) {}
+
+    default void contextDestroyed(ServletContextEvent sce) {}
+}
diff --git a/core/src/main/java/javax/servlet/ServletException.java b/core/src/main/java/javax/servlet/ServletException.java
new file mode 100644
index 0000000000..19743e9571
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletException.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+public class ServletException extends Exception {
+    private static final long serialVersionUID = 4221302886851315160L;
+
+    private Throwable rootCause;
+
+    public ServletException() {
+        super();
+    }
+
+    public ServletException(String message) {
+        super(message);
+    }
+
+    public ServletException(String message, Throwable rootCause) {
+        super(message, rootCause);
+        this.rootCause = rootCause;
+    }
+
+    public ServletException(Throwable rootCause) {
+        super(rootCause);
+        this.rootCause = rootCause;
+    }
+
+    public Throwable getRootCause() {
+        return rootCause;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletInputStream.java b/core/src/main/java/javax/servlet/ServletInputStream.java
new file mode 100644
index 0000000000..4686b4cd9a
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletInputStream.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public abstract class ServletInputStream extends InputStream {
+    protected ServletInputStream() {}
+
+    public int readLine(byte[] b, int off, int len) throws IOException {
+
+        if (len <= 0) {
+            return 0;
+        }
+        int count = 0, c;
+
+        while ((c = read()) != -1) {
+            b[off++] = (byte) c;
+            count++;
+            if (c == '\n' || count == len) {
+                break;
+            }
+        }
+        return count > 0 ? count : -1;
+    }
+
+    public abstract boolean isFinished();
+
+    public abstract boolean isReady();
+
+    public abstract void setReadListener(ReadListener readListener);
+
+    public jakarta.servlet.ServletInputStream toJakartaServletInputStream() {
+        return new jakarta.servlet.ServletInputStream() {
+            @Override
+            public int read() throws IOException {
+                return ServletInputStream.this.read();
+            }
+
+            @Override
+            public int readLine(byte[] b, int off, int len) throws IOException {
+                return ServletInputStream.this.readLine(b, off, len);
+            }
+
+            @Override
+            public int read(byte[] b) throws IOException {
+                return ServletInputStream.this.read(b);
+            }
+
+            @Override
+            public int read(byte[] b, int off, int len) throws IOException {
+                return ServletInputStream.this.read(b, off, len);
+            }
+
+            @Override
+            public byte[] readAllBytes() throws IOException {
+                return ServletInputStream.this.readAllBytes();
+            }
+
+            @Override
+            public byte[] readNBytes(int len) throws IOException {
+                return ServletInputStream.this.readNBytes(len);
+            }
+
+            @Override
+            public int readNBytes(byte[] b, int off, int len) throws IOException {
+                return ServletInputStream.this.readNBytes(b, off, len);
+            }
+
+            @Override
+            public long skip(long n) throws IOException {
+                return ServletInputStream.this.skip(n);
+            }
+
+            @Override
+            public int available() throws IOException {
+                return ServletInputStream.this.available();
+            }
+
+            @Override
+            public void close() throws IOException {
+                ServletInputStream.this.close();
+            }
+
+            @Override
+            public synchronized void mark(int readlimit) {
+                ServletInputStream.this.mark(readlimit);
+            }
+
+            @Override
+            public synchronized void reset() throws IOException {
+                ServletInputStream.this.reset();
+            }
+
+            @Override
+            public boolean markSupported() {
+                return ServletInputStream.this.markSupported();
+            }
+
+            @Override
+            public long transferTo(OutputStream out) throws IOException {
+                return ServletInputStream.this.transferTo(out);
+            }
+
+            @Override
+            public boolean isFinished() {
+                return ServletInputStream.this.isFinished();
+            }
+
+            @Override
+            public boolean isReady() {
+                return ServletInputStream.this.isReady();
+            }
+
+            @Override
+            public void setReadListener(jakarta.servlet.ReadListener readListener) {
+                ServletInputStream.this.setReadListener(ReadListener.fromJakartaReadListener(readListener));
+            }
+        };
+    }
+
+    public static ServletInputStream fromJakartaServletInputStream(jakarta.servlet.ServletInputStream from) {
+        return new ServletInputStream() {
+            @Override
+            public int readLine(byte[] b, int off, int len) throws IOException {
+                return from.readLine(b, off, len);
+            }
+
+            @Override
+            public int read(byte[] b) throws IOException {
+                return from.read(b);
+            }
+
+            @Override
+            public int read(byte[] b, int off, int len) throws IOException {
+                return from.read(b, off, len);
+            }
+
+            @Override
+            public byte[] readAllBytes() throws IOException {
+                return from.readAllBytes();
+            }
+
+            @Override
+            public byte[] readNBytes(int len) throws IOException {
+                return from.readNBytes(len);
+            }
+
+            @Override
+            public int readNBytes(byte[] b, int off, int len) throws IOException {
+                return from.readNBytes(b, off, len);
+            }
+
+            @Override
+            public long skip(long n) throws IOException {
+                return from.skip(n);
+            }
+
+            @Override
+            public int available() throws IOException {
+                return from.available();
+            }
+
+            @Override
+            public void close() throws IOException {
+                from.close();
+            }
+
+            @Override
+            public synchronized void mark(int readlimit) {
+                from.mark(readlimit);
+            }
+
+            @Override
+            public synchronized void reset() throws IOException {
+                from.reset();
+            }
+
+            @Override
+            public boolean markSupported() {
+                return from.markSupported();
+            }
+
+            @Override
+            public long transferTo(OutputStream out) throws IOException {
+                return from.transferTo(out);
+            }
+
+            @Override
+            public boolean isFinished() {
+                return from.isFinished();
+            }
+
+            @Override
+            public boolean isReady() {
+                return from.isReady();
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener) {
+                from.setReadListener(readListener.toJakartaReadListener());
+            }
+
+            @Override
+            public int read() throws IOException {
+                return from.read();
+            }
+
+            @Override
+            public jakarta.servlet.ServletInputStream toJakartaServletInputStream() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletOutputStream.java b/core/src/main/java/javax/servlet/ServletOutputStream.java
new file mode 100644
index 0000000000..8f0b0595ca
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletOutputStream.java
@@ -0,0 +1,344 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.io.CharConversionException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+
+public abstract class ServletOutputStream extends OutputStream {
+    private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
+    private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE);
+
+    protected ServletOutputStream() {}
+
+    public void print(String s) throws IOException {
+        if (s == null) s = "null";
+        int len = s.length();
+        byte[] out = new byte[len];
+        for (int i = 0; i < len; i++) {
+            char c = s.charAt(i);
+
+            if ((c & 0xff00) != 0) {
+                String errMsg = lStrings.getString("err.not_iso8859_1");
+                Object[] errArgs = new Object[1];
+                errArgs[0] = Character.valueOf(c);
+                errMsg = MessageFormat.format(errMsg, errArgs);
+                throw new CharConversionException(errMsg);
+            }
+            out[i] = (byte) (0xff & c);
+        }
+        write(out, 0, len);
+    }
+
+    public void print(boolean b) throws IOException {
+        print(lStrings.getString(b ? "value.true" : "value.false"));
+    }
+
+    public void print(char c) throws IOException {
+        print(String.valueOf(c));
+    }
+
+    public void print(int i) throws IOException {
+        print(String.valueOf(i));
+    }
+
+    public void print(long l) throws IOException {
+        print(String.valueOf(l));
+    }
+
+    public void print(float f) throws IOException {
+        print(String.valueOf(f));
+    }
+
+    public void print(double d) throws IOException {
+        print(String.valueOf(d));
+    }
+
+    public void println() throws IOException {
+        print("\r\n");
+    }
+
+    public void println(String s) throws IOException {
+        print(s == null ? "null\r\n" : (s + "\r\n"));
+    }
+
+    public void println(boolean b) throws IOException {
+        println(lStrings.getString(b ? "value.true" : "value.false"));
+    }
+
+    public void println(char c) throws IOException {
+        println(String.valueOf(c));
+    }
+
+    public void println(int i) throws IOException {
+        println(String.valueOf(i));
+    }
+
+    public void println(long l) throws IOException {
+        println(String.valueOf(l));
+    }
+
+    public void println(float f) throws IOException {
+        println(String.valueOf(f));
+    }
+
+    public void println(double d) throws IOException {
+        println(String.valueOf(d));
+    }
+
+    public abstract boolean isReady();
+
+    public abstract void setWriteListener(WriteListener writeListener);
+
+    public jakarta.servlet.ServletOutputStream toJakartaServletOutputStream() {
+        return new jakarta.servlet.ServletOutputStream() {
+            @Override
+            public void print(String s) throws IOException {
+                ServletOutputStream.this.print(s);
+            }
+
+            @Override
+            public void print(boolean b) throws IOException {
+                ServletOutputStream.this.print(b);
+            }
+
+            @Override
+            public void print(char c) throws IOException {
+                ServletOutputStream.this.print(c);
+            }
+
+            @Override
+            public void print(int i) throws IOException {
+                ServletOutputStream.this.print(i);
+            }
+
+            @Override
+            public void print(long l) throws IOException {
+                ServletOutputStream.this.print(l);
+            }
+
+            @Override
+            public void print(float f) throws IOException {
+                ServletOutputStream.this.print(f);
+            }
+
+            @Override
+            public void print(double d) throws IOException {
+                ServletOutputStream.this.print(d);
+            }
+
+            @Override
+            public void println() throws IOException {
+                ServletOutputStream.this.println();
+            }
+
+            @Override
+            public void println(String s) throws IOException {
+                ServletOutputStream.this.println(s);
+            }
+
+            @Override
+            public void println(boolean b) throws IOException {
+                ServletOutputStream.this.println(b);
+            }
+
+            @Override
+            public void println(char c) throws IOException {
+                ServletOutputStream.this.println(c);
+            }
+
+            @Override
+            public void println(int i) throws IOException {
+                ServletOutputStream.this.println(i);
+            }
+
+            @Override
+            public void println(long l) throws IOException {
+                ServletOutputStream.this.println(l);
+            }
+
+            @Override
+            public void println(float f) throws IOException {
+                ServletOutputStream.this.println(f);
+            }
+
+            @Override
+            public void println(double d) throws IOException {
+                ServletOutputStream.this.println(d);
+            }
+
+            @Override
+            public void write(byte[] b) throws IOException {
+                ServletOutputStream.this.write(b);
+            }
+
+            @Override
+            public void write(byte[] b, int off, int len) throws IOException {
+                ServletOutputStream.this.write(b, off, len);
+            }
+
+            @Override
+            public void flush() throws IOException {
+                ServletOutputStream.this.flush();
+            }
+
+            @Override
+            public void close() throws IOException {
+                ServletOutputStream.this.close();
+            }
+
+            @Override
+            public boolean isReady() {
+                return ServletOutputStream.this.isReady();
+            }
+
+            @Override
+            public void setWriteListener(jakarta.servlet.WriteListener writeListener) {
+                ServletOutputStream.this.setWriteListener(WriteListener.fromJakartaWriteListener(writeListener));
+            }
+
+            @Override
+            public void write(int b) throws IOException {
+                ServletOutputStream.this.write(b);
+            }
+        };
+    }
+
+    public static ServletOutputStream fromJakartaServletOutputStream(jakarta.servlet.ServletOutputStream from) {
+        return new ServletOutputStream() {
+            @Override
+            public void print(String s) throws IOException {
+                from.print(s);
+            }
+
+            @Override
+            public void print(boolean b) throws IOException {
+                from.print(b);
+            }
+
+            @Override
+            public void print(char c) throws IOException {
+                from.print(c);
+            }
+
+            @Override
+            public void print(int i) throws IOException {
+                from.print(i);
+            }
+
+            @Override
+            public void print(long l) throws IOException {
+                from.print(l);
+            }
+
+            @Override
+            public void print(float f) throws IOException {
+                from.print(f);
+            }
+
+            @Override
+            public void print(double d) throws IOException {
+                from.print(d);
+            }
+
+            @Override
+            public void println() throws IOException {
+                from.println();
+            }
+
+            @Override
+            public void println(String s) throws IOException {
+                from.println(s);
+            }
+
+            @Override
+            public void println(boolean b) throws IOException {
+                from.println(b);
+            }
+
+            @Override
+            public void println(char c) throws IOException {
+                from.println(c);
+            }
+
+            @Override
+            public void println(int i) throws IOException {
+                from.println(i);
+            }
+
+            @Override
+            public void println(long l) throws IOException {
+                from.println(l);
+            }
+
+            @Override
+            public void println(float f) throws IOException {
+                from.println(f);
+            }
+
+            @Override
+            public void println(double d) throws IOException {
+                from.println(d);
+            }
+
+            @Override
+            public void write(byte[] b) throws IOException {
+                from.write(b);
+            }
+
+            @Override
+            public void write(byte[] b, int off, int len) throws IOException {
+                from.write(b, off, len);
+            }
+
+            @Override
+            public void flush() throws IOException {
+                from.flush();
+            }
+
+            @Override
+            public void close() throws IOException {
+                from.close();
+            }
+
+            @Override
+            public boolean isReady() {
+                return from.isReady();
+            }
+
+            @Override
+            public void setWriteListener(WriteListener writeListener) {
+                from.setWriteListener(writeListener.toJakartaWriteListener());
+            }
+
+            @Override
+            public void write(int b) throws IOException {
+                from.write(b);
+            }
+
+            @Override
+            public jakarta.servlet.ServletOutputStream toJakartaServletOutputStream() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletRegistration.java b/core/src/main/java/javax/servlet/ServletRegistration.java
new file mode 100644
index 0000000000..a86f553926
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletRegistration.java
@@ -0,0 +1,321 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+public interface ServletRegistration extends Registration {
+    Set<String> addMapping(String... urlPatterns);
+
+    Collection<String> getMappings();
+
+    String getRunAsRole();
+
+    interface Dynamic extends ServletRegistration, Registration.Dynamic {
+        void setLoadOnStartup(int loadOnStartup);
+
+        Set<String> setServletSecurity(ServletSecurityElement constraint);
+
+        void setMultipartConfig(MultipartConfigElement multipartConfig);
+
+        void setRunAsRole(String roleName);
+
+        default jakarta.servlet.ServletRegistration.Dynamic toJakartaServletRegistrationDynamic() {
+            return new jakarta.servlet.ServletRegistration.Dynamic() {
+                @Override
+                public String getName() {
+                    return ServletRegistration.Dynamic.this.getName();
+                }
+
+                @Override
+                public String getClassName() {
+                    return ServletRegistration.Dynamic.this.getClassName();
+                }
+
+                @Override
+                public boolean setInitParameter(String name, String value) {
+                    return ServletRegistration.Dynamic.this.setInitParameter(name, value);
+                }
+
+                @Override
+                public String getInitParameter(String name) {
+                    return ServletRegistration.Dynamic.this.getInitParameter(name);
+                }
+
+                @Override
+                public Set<String> setInitParameters(Map<String, String> initParameters) {
+                    return ServletRegistration.Dynamic.this.setInitParameters(initParameters);
+                }
+
+                @Override
+                public Map<String, String> getInitParameters() {
+                    return ServletRegistration.Dynamic.this.getInitParameters();
+                }
+
+                @Override
+                public Set<String> addMapping(String... urlPatterns) {
+                    return ServletRegistration.Dynamic.this.addMapping(urlPatterns);
+                }
+
+                @Override
+                public Collection<String> getMappings() {
+                    return ServletRegistration.Dynamic.this.getMappings();
+                }
+
+                @Override
+                public String getRunAsRole() {
+                    return ServletRegistration.Dynamic.this.getRunAsRole();
+                }
+
+                @Override
+                public void setAsyncSupported(boolean isAsyncSupported) {
+                    ServletRegistration.Dynamic.this.setAsyncSupported(isAsyncSupported);
+                }
+
+                @Override
+                public void setLoadOnStartup(int loadOnStartup) {
+                    ServletRegistration.Dynamic.this.setLoadOnStartup(loadOnStartup);
+                }
+
+                @Override
+                public Set<String> setServletSecurity(jakarta.servlet.ServletSecurityElement constraint) {
+                    // TODO
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public void setMultipartConfig(jakarta.servlet.MultipartConfigElement multipartConfig) {
+                    // TODO
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public void setRunAsRole(String roleName) {
+                    ServletRegistration.Dynamic.this.setRunAsRole(roleName);
+                }
+            };
+        }
+
+        static ServletRegistration.Dynamic fromJakartaServletRegistrationDynamic(
+                jakarta.servlet.ServletRegistration.Dynamic from) {
+            return new ServletRegistration.Dynamic() {
+                @Override
+                public void setLoadOnStartup(int loadOnStartup) {
+                    from.setLoadOnStartup(loadOnStartup);
+                }
+
+                @Override
+                public Set<String> setServletSecurity(ServletSecurityElement constraint) {
+                    // TODO
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public void setMultipartConfig(MultipartConfigElement multipartConfig) {
+                    // TODO
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public void setRunAsRole(String roleName) {
+                    from.setRunAsRole(roleName);
+                }
+
+                @Override
+                public Set<String> addMapping(String... urlPatterns) {
+                    return from.addMapping(urlPatterns);
+                }
+
+                @Override
+                public Collection<String> getMappings() {
+                    return from.getMappings();
+                }
+
+                @Override
+                public String getRunAsRole() {
+                    return from.getRunAsRole();
+                }
+
+                @Override
+                public void setAsyncSupported(boolean isAsyncSupported) {
+                    from.setAsyncSupported(isAsyncSupported);
+                }
+
+                @Override
+                public String getName() {
+                    return from.getName();
+                }
+
+                @Override
+                public String getClassName() {
+                    return from.getClassName();
+                }
+
+                @Override
+                public boolean setInitParameter(String name, String value) {
+                    return from.setInitParameter(name, value);
+                }
+
+                @Override
+                public String getInitParameter(String name) {
+                    return from.getInitParameter(name);
+                }
+
+                @Override
+                public Set<String> setInitParameters(Map<String, String> initParameters) {
+                    return from.setInitParameters(initParameters);
+                }
+
+                @Override
+                public Map<String, String> getInitParameters() {
+                    return from.getInitParameters();
+                }
+
+                @Override
+                public jakarta.servlet.Registration toJakartaRegistration() {
+                    return from;
+                }
+
+                @Override
+                public jakarta.servlet.Registration.Dynamic toJakartaRegistrationDynamic() {
+                    return from;
+                }
+
+                @Override
+                public jakarta.servlet.ServletRegistration toJakartaServletRegistration() {
+                    return from;
+                }
+
+                @Override
+                public jakarta.servlet.ServletRegistration.Dynamic toJakartaServletRegistrationDynamic() {
+                    return from;
+                }
+            };
+        }
+    }
+
+    default jakarta.servlet.ServletRegistration toJakartaServletRegistration() {
+        return new jakarta.servlet.ServletRegistration() {
+            @Override
+            public String getName() {
+                return ServletRegistration.this.getName();
+            }
+
+            @Override
+            public String getClassName() {
+                return ServletRegistration.this.getClassName();
+            }
+
+            @Override
+            public boolean setInitParameter(String name, String value) {
+                return ServletRegistration.this.setInitParameter(name, value);
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return ServletRegistration.this.getInitParameter(name);
+            }
+
+            @Override
+            public Set<String> setInitParameters(Map<String, String> initParameters) {
+                return ServletRegistration.this.setInitParameters(initParameters);
+            }
+
+            @Override
+            public Map<String, String> getInitParameters() {
+                return ServletRegistration.this.getInitParameters();
+            }
+
+            @Override
+            public Set<String> addMapping(String... urlPatterns) {
+                return ServletRegistration.this.addMapping(urlPatterns);
+            }
+
+            @Override
+            public Collection<String> getMappings() {
+                return ServletRegistration.this.getMappings();
+            }
+
+            @Override
+            public String getRunAsRole() {
+                return ServletRegistration.this.getRunAsRole();
+            }
+        };
+    }
+
+    static ServletRegistration fromJakartaServletRegistration(jakarta.servlet.ServletRegistration from) {
+        return new ServletRegistration() {
+            @Override
+            public String getName() {
+                return from.getName();
+            }
+
+            @Override
+            public String getClassName() {
+                return from.getClassName();
+            }
+
+            @Override
+            public boolean setInitParameter(String name, String value) {
+                return from.setInitParameter(name, value);
+            }
+
+            @Override
+            public String getInitParameter(String name) {
+                return from.getInitParameter(name);
+            }
+
+            @Override
+            public Set<String> setInitParameters(Map<String, String> initParameters) {
+                return from.setInitParameters(initParameters);
+            }
+
+            @Override
+            public Map<String, String> getInitParameters() {
+                return from.getInitParameters();
+            }
+
+            @Override
+            public Set<String> addMapping(String... urlPatterns) {
+                return from.addMapping(urlPatterns);
+            }
+
+            @Override
+            public Collection<String> getMappings() {
+                return from.getMappings();
+            }
+
+            @Override
+            public String getRunAsRole() {
+                return from.getRunAsRole();
+            }
+
+            @Override
+            public jakarta.servlet.Registration toJakartaRegistration() {
+                return from;
+            }
+
+            @Override
+            public jakarta.servlet.ServletRegistration toJakartaServletRegistration() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletRequest.java b/core/src/main/java/javax/servlet/ServletRequest.java
new file mode 100644
index 0000000000..3093e04d09
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletRequest.java
@@ -0,0 +1,521 @@
+/*
+ * Copyright (c) 1997, 2019 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+
+public interface ServletRequest {
+    Object getAttribute(String name);
+
+    Enumeration<String> getAttributeNames();
+
+    String getCharacterEncoding();
+
+    void setCharacterEncoding(String env) throws UnsupportedEncodingException;
+
+    int getContentLength();
+
+    long getContentLengthLong();
+
+    String getContentType();
+
+    @WithBridgeMethods(ServletInputStream.class)
+    jakarta.servlet.ServletInputStream getInputStream() throws IOException;
+
+    String getParameter(String name);
+
+    Enumeration<String> getParameterNames();
+
+    String[] getParameterValues(String name);
+
+    Map<String, String[]> getParameterMap();
+
+    String getProtocol();
+
+    String getScheme();
+
+    String getServerName();
+
+    int getServerPort();
+
+    BufferedReader getReader() throws IOException;
+
+    String getRemoteAddr();
+
+    String getRemoteHost();
+
+    void setAttribute(String name, Object o);
+
+    void removeAttribute(String name);
+
+    Locale getLocale();
+
+    Enumeration<Locale> getLocales();
+
+    boolean isSecure();
+
+    @WithBridgeMethods(RequestDispatcher.class)
+    jakarta.servlet.RequestDispatcher getRequestDispatcher(String path);
+
+    @Deprecated
+    String getRealPath(String path);
+
+    int getRemotePort();
+
+    String getLocalName();
+
+    String getLocalAddr();
+
+    int getLocalPort();
+
+    @WithBridgeMethods(ServletContext.class)
+    jakarta.servlet.ServletContext getServletContext();
+
+    // AsyncContext startAsync() throws IllegalStateException;
+
+    // AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws
+    // IllegalStateException;
+
+    // boolean isAsyncStarted();
+
+    // boolean isAsyncSupported();
+
+    // AsyncContext getAsyncContext();
+
+    @WithBridgeMethods(DispatcherType.class)
+    jakarta.servlet.DispatcherType getDispatcherType();
+
+    default jakarta.servlet.ServletRequest toJakartaServletRequest() {
+        return new jakarta.servlet.ServletRequest() {
+            @Override
+            public Object getAttribute(String name) {
+                return ServletRequest.this.getAttribute(name);
+            }
+
+            @Override
+            public Enumeration<String> getAttributeNames() {
+                return ServletRequest.this.getAttributeNames();
+            }
+
+            @Override
+            public String getCharacterEncoding() {
+                return ServletRequest.this.getCharacterEncoding();
+            }
+
+            @Override
+            public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
+                ServletRequest.this.setCharacterEncoding(env);
+            }
+
+            @Override
+            public int getContentLength() {
+                return ServletRequest.this.getContentLength();
+            }
+
+            @Override
+            public long getContentLengthLong() {
+                return ServletRequest.this.getContentLengthLong();
+            }
+
+            @Override
+            public String getContentType() {
+                return ServletRequest.this.getContentType();
+            }
+
+            @Override
+            public jakarta.servlet.ServletInputStream getInputStream() throws IOException {
+                return ServletRequest.this.getInputStream();
+            }
+
+            @Override
+            public String getParameter(String name) {
+                return ServletRequest.this.getParameter(name);
+            }
+
+            @Override
+            public Enumeration<String> getParameterNames() {
+                return ServletRequest.this.getParameterNames();
+            }
+
+            @Override
+            public String[] getParameterValues(String name) {
+                return ServletRequest.this.getParameterValues(name);
+            }
+
+            @Override
+            public Map<String, String[]> getParameterMap() {
+                return ServletRequest.this.getParameterMap();
+            }
+
+            @Override
+            public String getProtocol() {
+                return ServletRequest.this.getProtocol();
+            }
+
+            @Override
+            public String getScheme() {
+                return ServletRequest.this.getScheme();
+            }
+
+            @Override
+            public String getServerName() {
+                return ServletRequest.this.getServerName();
+            }
+
+            @Override
+            public int getServerPort() {
+                return ServletRequest.this.getServerPort();
+            }
+
+            @Override
+            public BufferedReader getReader() throws IOException {
+                return ServletRequest.this.getReader();
+            }
+
+            @Override
+            public String getRemoteAddr() {
+                return ServletRequest.this.getRemoteAddr();
+            }
+
+            @Override
+            public String getRemoteHost() {
+                return ServletRequest.this.getRemoteHost();
+            }
+
+            @Override
+            public void setAttribute(String name, Object o) {
+                ServletRequest.this.setAttribute(name, o);
+            }
+
+            @Override
+            public void removeAttribute(String name) {
+                ServletRequest.this.removeAttribute(name);
+            }
+
+            @Override
+            public Locale getLocale() {
+                return ServletRequest.this.getLocale();
+            }
+
+            @Override
+            public Enumeration<Locale> getLocales() {
+                return ServletRequest.this.getLocales();
+            }
+
+            @Override
+            public boolean isSecure() {
+                return ServletRequest.this.isSecure();
+            }
+
+            @Override
+            public jakarta.servlet.RequestDispatcher getRequestDispatcher(String path) {
+                return ServletRequest.this.getRequestDispatcher(path);
+            }
+
+            @Override
+            public String getRealPath(String path) {
+                return ServletRequest.this.getRealPath(path);
+            }
+
+            @Override
+            public int getRemotePort() {
+                return ServletRequest.this.getRemotePort();
+            }
+
+            @Override
+            public String getLocalName() {
+                return ServletRequest.this.getLocalName();
+            }
+
+            @Override
+            public String getLocalAddr() {
+                return ServletRequest.this.getLocalAddr();
+            }
+
+            @Override
+            public int getLocalPort() {
+                return ServletRequest.this.getLocalPort();
+            }
+
+            @Override
+            public jakarta.servlet.ServletContext getServletContext() {
+                return ServletRequest.this.getServletContext();
+            }
+
+            @Override
+            public jakarta.servlet.AsyncContext startAsync() throws IllegalStateException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public jakarta.servlet.AsyncContext startAsync(
+                    jakarta.servlet.ServletRequest servletRequest, jakarta.servlet.ServletResponse servletResponse)
+                    throws IllegalStateException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public boolean isAsyncStarted() {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public boolean isAsyncSupported() {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public jakarta.servlet.AsyncContext getAsyncContext() {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public jakarta.servlet.DispatcherType getDispatcherType() {
+                return ServletRequest.this.getDispatcherType();
+            }
+        };
+    }
+
+    static ServletRequest fromJakartaServletRequest(jakarta.servlet.ServletRequest from) {
+        return new ServletRequest() {
+            @Override
+            public Object getAttribute(String name) {
+                return from.getAttribute(name);
+            }
+
+            @Override
+            public Enumeration<String> getAttributeNames() {
+                return from.getAttributeNames();
+            }
+
+            @Override
+            public String getCharacterEncoding() {
+                return from.getCharacterEncoding();
+            }
+
+            @Override
+            public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
+                from.setCharacterEncoding(env);
+            }
+
+            @Override
+            public int getContentLength() {
+                return from.getContentLength();
+            }
+
+            @Override
+            public long getContentLengthLong() {
+                return from.getContentLengthLong();
+            }
+
+            @Override
+            public String getContentType() {
+                return from.getContentType();
+            }
+
+            @Override
+            @WithBridgeMethods(value = ServletInputStream.class, adapterMethod = "fromJakartaServletInputStream")
+            public jakarta.servlet.ServletInputStream getInputStream() throws IOException {
+                return from.getInputStream();
+            }
+
+            private Object fromJakartaServletInputStream(
+                    jakarta.servlet.ServletInputStream inputStream, Class<?> type) {
+                return ServletInputStream.fromJakartaServletInputStream(inputStream);
+            }
+
+            @Override
+            public String getParameter(String name) {
+                return from.getParameter(name);
+            }
+
+            @Override
+            public Enumeration<String> getParameterNames() {
+                return from.getParameterNames();
+            }
+
+            @Override
+            public String[] getParameterValues(String name) {
+                return from.getParameterValues(name);
+            }
+
+            @Override
+            public Map<String, String[]> getParameterMap() {
+                return from.getParameterMap();
+            }
+
+            @Override
+            public String getProtocol() {
+                return from.getProtocol();
+            }
+
+            @Override
+            public String getScheme() {
+                return from.getScheme();
+            }
+
+            @Override
+            public String getServerName() {
+                return from.getServerName();
+            }
+
+            @Override
+            public int getServerPort() {
+                return from.getServerPort();
+            }
+
+            @Override
+            public BufferedReader getReader() throws IOException {
+                return from.getReader();
+            }
+
+            @Override
+            public String getRemoteAddr() {
+                return from.getRemoteAddr();
+            }
+
+            @Override
+            public String getRemoteHost() {
+                return from.getRemoteHost();
+            }
+
+            @Override
+            public void setAttribute(String name, Object o) {
+                from.setAttribute(name, o);
+            }
+
+            @Override
+            public void removeAttribute(String name) {
+                from.removeAttribute(name);
+            }
+
+            @Override
+            public Locale getLocale() {
+                return from.getLocale();
+            }
+
+            @Override
+            public Enumeration<Locale> getLocales() {
+                return from.getLocales();
+            }
+
+            @Override
+            public boolean isSecure() {
+                return from.isSecure();
+            }
+
+            @WithBridgeMethods(value = RequestDispatcher.class, adapterMethod = "fromJakartaRequestDispatcher")
+            public jakarta.servlet.RequestDispatcher getRequestDispatcher(String path) {
+                return from.getRequestDispatcher(path);
+            }
+
+            private Object fromJakartaRequestDispatcher(
+                    jakarta.servlet.RequestDispatcher requestDispatcher, Class<?> type) {
+                return RequestDispatcher.fromJakartaRequestDispatcher(requestDispatcher);
+            }
+
+            @Override
+            public String getRealPath(String path) {
+                return from.getRealPath(path);
+            }
+
+            @Override
+            public int getRemotePort() {
+                return from.getRemotePort();
+            }
+
+            @Override
+            public String getLocalName() {
+                return from.getLocalName();
+            }
+
+            @Override
+            public String getLocalAddr() {
+                return from.getLocalAddr();
+            }
+
+            @Override
+            public int getLocalPort() {
+                return from.getLocalPort();
+            }
+
+            @Override
+            @WithBridgeMethods(value = ServletContext.class, adapterMethod = "fromJakartaServletContext")
+            public jakarta.servlet.ServletContext getServletContext() {
+                return from.getServletContext();
+            }
+
+            private Object fromJakartaServletContext(jakarta.servlet.ServletContext servletContext, Class<?> type) {
+                return ServletContext.fromJakartServletContext(servletContext);
+            }
+
+            // @Override
+            // public AsyncContext startAsync() throws IllegalStateException {
+            //    throw new UnsupportedOperationException();
+            // }
+
+            // @Override
+            // public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+            //        throws IllegalStateException {
+            //    throw new UnsupportedOperationException();
+            // }
+
+            // @Override
+            // public boolean isAsyncStarted() {
+            //    return from.isAsyncStarted();
+            // }
+
+            // @Override
+            // public boolean isAsyncSupported() {
+            //    return from.isAsyncSupported();
+            // }
+
+            // @Override
+            // public AsyncContext getAsyncContext() {
+            //    throw new UnsupportedOperationException();
+            // }
+
+            @Override
+            @WithBridgeMethods(value = DispatcherType.class, adapterMethod = "fromJakartaDispatcherType")
+            public jakarta.servlet.DispatcherType getDispatcherType() {
+                return from.getDispatcherType();
+            }
+
+            private Object fromJakartaDispatcherType(jakarta.servlet.DispatcherType dispatcherType, Class<?> type) {
+                return DispatcherType.fromJakartaDispatcherType(dispatcherType);
+            }
+
+            @Override
+            public jakarta.servlet.ServletRequest toJakartaServletRequest() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletRequestAttributeEvent.java b/core/src/main/java/javax/servlet/ServletRequestAttributeEvent.java
new file mode 100644
index 0000000000..c7edeb4f57
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletRequestAttributeEvent.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+public class ServletRequestAttributeEvent extends ServletRequestEvent {
+    private static final long serialVersionUID = -1466635426192317793L;
+
+    private String name;
+    private Object value;
+
+    public ServletRequestAttributeEvent(ServletContext sc, ServletRequest request, String name, Object value) {
+        super(sc, request);
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public Object getValue() {
+        return this.value;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletRequestAttributeListener.java b/core/src/main/java/javax/servlet/ServletRequestAttributeListener.java
new file mode 100644
index 0000000000..85a226e7e5
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletRequestAttributeListener.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.util.EventListener;
+
+public interface ServletRequestAttributeListener extends EventListener {
+    default void attributeAdded(ServletRequestAttributeEvent srae) {}
+
+    default void attributeRemoved(ServletRequestAttributeEvent srae) {}
+
+    default void attributeReplaced(ServletRequestAttributeEvent srae) {}
+}
diff --git a/core/src/main/java/javax/servlet/ServletRequestEvent.java b/core/src/main/java/javax/servlet/ServletRequestEvent.java
new file mode 100644
index 0000000000..6e788e7ca8
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletRequestEvent.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+public class ServletRequestEvent extends java.util.EventObject {
+    private static final long serialVersionUID = -7467864054698729101L;
+
+    private final transient ServletRequest request;
+
+    public ServletRequestEvent(ServletContext sc, ServletRequest request) {
+        super(sc);
+        this.request = request;
+    }
+
+    public ServletRequest getServletRequest() {
+        return this.request;
+    }
+
+    public ServletContext getServletContext() {
+        return (ServletContext) super.getSource();
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletRequestListener.java b/core/src/main/java/javax/servlet/ServletRequestListener.java
new file mode 100644
index 0000000000..3a30d4a191
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletRequestListener.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import java.util.EventListener;
+
+public interface ServletRequestListener extends EventListener {
+    default void requestDestroyed(ServletRequestEvent sre) {}
+
+    default void requestInitialized(ServletRequestEvent sre) {}
+}
diff --git a/core/src/main/java/javax/servlet/ServletRequestWrapper.java b/core/src/main/java/javax/servlet/ServletRequestWrapper.java
new file mode 100644
index 0000000000..5dceebc9c9
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletRequestWrapper.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+
+public class ServletRequestWrapper implements ServletRequest {
+    private ServletRequest request;
+
+    public ServletRequestWrapper(ServletRequest request) {
+        if (request == null) {
+            throw new IllegalArgumentException("Request cannot be null");
+        }
+        this.request = request;
+    }
+
+    public ServletRequest getRequest() {
+        return this.request;
+    }
+
+    public void setRequest(ServletRequest request) {
+        if (request == null) {
+            throw new IllegalArgumentException("Request cannot be null");
+        }
+        this.request = request;
+    }
+
+    @Override
+    public Object getAttribute(String name) {
+        return this.request.getAttribute(name);
+    }
+
+    @Override
+    public Enumeration<String> getAttributeNames() {
+        return this.request.getAttributeNames();
+    }
+
+    @Override
+    public String getCharacterEncoding() {
+        return this.request.getCharacterEncoding();
+    }
+
+    @Override
+    public void setCharacterEncoding(String enc) throws UnsupportedEncodingException {
+        this.request.setCharacterEncoding(enc);
+    }
+
+    @Override
+    public int getContentLength() {
+        return this.request.getContentLength();
+    }
+
+    @Override
+    public long getContentLengthLong() {
+        return this.request.getContentLengthLong();
+    }
+
+    @Override
+    public String getContentType() {
+        return this.request.getContentType();
+    }
+
+    @Override
+    @WithBridgeMethods(value = ServletInputStream.class, adapterMethod = "fromJakartaServletInputStream")
+    public jakarta.servlet.ServletInputStream getInputStream() throws IOException {
+        return this.request.getInputStream();
+    }
+
+    private Object fromJakartaServletInputStream(jakarta.servlet.ServletInputStream inputStream, Class<?> type) {
+        return ServletInputStream.fromJakartaServletInputStream(inputStream);
+    }
+
+    @Override
+    public String getParameter(String name) {
+        return this.request.getParameter(name);
+    }
+
+    @Override
+    public Map<String, String[]> getParameterMap() {
+        return this.request.getParameterMap();
+    }
+
+    @Override
+    public Enumeration<String> getParameterNames() {
+        return this.request.getParameterNames();
+    }
+
+    @Override
+    public String[] getParameterValues(String name) {
+        return this.request.getParameterValues(name);
+    }
+
+    @Override
+    public String getProtocol() {
+        return this.request.getProtocol();
+    }
+
+    @Override
+    public String getScheme() {
+        return this.request.getScheme();
+    }
+
+    @Override
+    public String getServerName() {
+        return this.request.getServerName();
+    }
+
+    @Override
+    public int getServerPort() {
+        return this.request.getServerPort();
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return this.request.getReader();
+    }
+
+    @Override
+    public String getRemoteAddr() {
+        return this.request.getRemoteAddr();
+    }
+
+    @Override
+    public String getRemoteHost() {
+        return this.request.getRemoteHost();
+    }
+
+    @Override
+    public void setAttribute(String name, Object o) {
+        this.request.setAttribute(name, o);
+    }
+
+    @Override
+    public void removeAttribute(String name) {
+        this.request.removeAttribute(name);
+    }
+
+    @Override
+    public Locale getLocale() {
+        return this.request.getLocale();
+    }
+
+    @Override
+    public Enumeration<Locale> getLocales() {
+        return this.request.getLocales();
+    }
+
+    @Override
+    public boolean isSecure() {
+        return this.request.isSecure();
+    }
+
+    @Override
+    @WithBridgeMethods(value = RequestDispatcher.class, adapterMethod = "fromJakartaRequestDispatcher")
+    public jakarta.servlet.RequestDispatcher getRequestDispatcher(String path) {
+        return this.request.getRequestDispatcher(path);
+    }
+
+    private Object fromJakartaRequestDispatcher(jakarta.servlet.RequestDispatcher requestDispatcher, Class<?> type) {
+        return RequestDispatcher.fromJakartaRequestDispatcher(requestDispatcher);
+    }
+
+    @Override
+    @Deprecated
+    public String getRealPath(String path) {
+        return this.request.getRealPath(path);
+    }
+
+    @Override
+    public int getRemotePort() {
+        return this.request.getRemotePort();
+    }
+
+    @Override
+    public String getLocalName() {
+        return this.request.getLocalName();
+    }
+
+    @Override
+    public String getLocalAddr() {
+        return this.request.getLocalAddr();
+    }
+
+    @Override
+    public int getLocalPort() {
+        return this.request.getLocalPort();
+    }
+
+    @Override
+    @WithBridgeMethods(value = ServletContext.class, adapterMethod = "fromJakartaServletContext")
+    public jakarta.servlet.ServletContext getServletContext() {
+        return request.getServletContext();
+    }
+
+    private Object fromJakartaServletContext(jakarta.servlet.ServletContext servletContext, Class<?> type) {
+        return ServletContext.fromJakartServletContext(servletContext);
+    }
+
+    // @Override
+    // public AsyncContext startAsync() throws IllegalStateException {
+    //    return request.startAsync();
+    // }
+
+    // @Override
+    // public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+    //        throws IllegalStateException {
+    //    return request.startAsync(servletRequest, servletResponse);
+    // }
+
+    // @Override
+    // public boolean isAsyncStarted() {
+    //    return request.isAsyncStarted();
+    // }
+
+    // @Override
+    // public boolean isAsyncSupported() {
+    //    return request.isAsyncSupported();
+    // }
+
+    // @Override
+    // public AsyncContext getAsyncContext() {
+    //    return request.getAsyncContext();
+    // }
+
+    public boolean isWrapperFor(ServletRequest wrapped) {
+        if (request == wrapped) {
+            return true;
+        } else if (request instanceof ServletRequestWrapper) {
+            return ((ServletRequestWrapper) request).isWrapperFor(wrapped);
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isWrapperFor(Class<?> wrappedType) {
+        if (!ServletRequest.class.isAssignableFrom(wrappedType)) {
+            throw new IllegalArgumentException("Given class " + wrappedType.getName() + " not a subinterface of "
+                    + ServletRequest.class.getName());
+        }
+        if (wrappedType.isAssignableFrom(request.getClass())) {
+            return true;
+        } else if (request instanceof ServletRequestWrapper) {
+            return ((ServletRequestWrapper) request).isWrapperFor(wrappedType);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    @WithBridgeMethods(value = DispatcherType.class, adapterMethod = "fromJakartaDispatcherType")
+    public jakarta.servlet.DispatcherType getDispatcherType() {
+        return request.getDispatcherType();
+    }
+
+    private Object fromJakartaDispatcherType(jakarta.servlet.DispatcherType dispatcherType, Class<?> type) {
+        return DispatcherType.fromJakartaDispatcherType(dispatcherType);
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletResponse.java b/core/src/main/java/javax/servlet/ServletResponse.java
new file mode 100644
index 0000000000..9a2ef2f12c
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletResponse.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Locale;
+
+public interface ServletResponse {
+    String getCharacterEncoding();
+
+    String getContentType();
+
+    @WithBridgeMethods(ServletOutputStream.class)
+    jakarta.servlet.ServletOutputStream getOutputStream() throws IOException;
+
+    PrintWriter getWriter() throws IOException;
+
+    void setCharacterEncoding(String charset);
+
+    void setContentLength(int len);
+
+    void setContentLengthLong(long len);
+
+    void setContentType(String type);
+
+    void setBufferSize(int size);
+
+    int getBufferSize();
+
+    void flushBuffer() throws IOException;
+
+    void resetBuffer();
+
+    boolean isCommitted();
+
+    void reset();
+
+    void setLocale(Locale loc);
+
+    Locale getLocale();
+
+    default jakarta.servlet.ServletResponse toJakartaServletResponse() {
+        return new jakarta.servlet.ServletResponse() {
+            @Override
+            public String getCharacterEncoding() {
+                return ServletResponse.this.getCharacterEncoding();
+            }
+
+            @Override
+            public String getContentType() {
+                return ServletResponse.this.getContentType();
+            }
+
+            @Override
+            public jakarta.servlet.ServletOutputStream getOutputStream() throws IOException {
+                return ServletResponse.this.getOutputStream();
+            }
+
+            @Override
+            public PrintWriter getWriter() throws IOException {
+                return ServletResponse.this.getWriter();
+            }
+
+            @Override
+            public void setCharacterEncoding(String charset) {
+                ServletResponse.this.setCharacterEncoding(charset);
+            }
+
+            @Override
+            public void setContentLength(int len) {
+                ServletResponse.this.setContentLength(len);
+            }
+
+            @Override
+            public void setContentLengthLong(long len) {
+                ServletResponse.this.setContentLengthLong(len);
+            }
+
+            @Override
+            public void setContentType(String type) {
+                ServletResponse.this.setContentType(type);
+            }
+
+            @Override
+            public void setBufferSize(int size) {
+                ServletResponse.this.setBufferSize(size);
+            }
+
+            @Override
+            public int getBufferSize() {
+                return ServletResponse.this.getBufferSize();
+            }
+
+            @Override
+            public void flushBuffer() throws IOException {
+                ServletResponse.this.flushBuffer();
+            }
+
+            @Override
+            public void resetBuffer() {
+                ServletResponse.this.resetBuffer();
+            }
+
+            @Override
+            public boolean isCommitted() {
+                return ServletResponse.this.isCommitted();
+            }
+
+            @Override
+            public void reset() {
+                ServletResponse.this.reset();
+            }
+
+            @Override
+            public void setLocale(Locale loc) {
+                ServletResponse.this.setLocale(loc);
+            }
+
+            @Override
+            public Locale getLocale() {
+                return ServletResponse.this.getLocale();
+            }
+        };
+    }
+
+    static ServletResponse fromJakartaServletResponse(jakarta.servlet.ServletResponse from) {
+        return new ServletResponse() {
+            @Override
+            public String getCharacterEncoding() {
+                return from.getCharacterEncoding();
+            }
+
+            @Override
+            public String getContentType() {
+                return from.getContentType();
+            }
+
+            @Override
+            @WithBridgeMethods(value = ServletOutputStream.class, adapterMethod = "fromJakartaServletOutputStream")
+            public jakarta.servlet.ServletOutputStream getOutputStream() throws IOException {
+                return from.getOutputStream();
+            }
+
+            private Object fromJakartaServletOutputStream(
+                    jakarta.servlet.ServletOutputStream outputStream, Class<?> type) {
+                return ServletOutputStream.fromJakartaServletOutputStream(outputStream);
+            }
+
+            @Override
+            public PrintWriter getWriter() throws IOException {
+                return from.getWriter();
+            }
+
+            @Override
+            public void setCharacterEncoding(String charset) {
+                from.setCharacterEncoding(charset);
+            }
+
+            @Override
+            public void setContentLength(int len) {
+                from.setContentLength(len);
+            }
+
+            @Override
+            public void setContentLengthLong(long len) {
+                from.setContentLengthLong(len);
+            }
+
+            @Override
+            public void setContentType(String type) {
+                from.setContentType(type);
+            }
+
+            @Override
+            public void setBufferSize(int size) {
+                from.setBufferSize(size);
+            }
+
+            @Override
+            public int getBufferSize() {
+                return from.getBufferSize();
+            }
+
+            @Override
+            public void flushBuffer() throws IOException {
+                from.flushBuffer();
+            }
+
+            @Override
+            public void resetBuffer() {
+                from.resetBuffer();
+            }
+
+            @Override
+            public boolean isCommitted() {
+                return from.isCommitted();
+            }
+
+            @Override
+            public void reset() {
+                from.reset();
+            }
+
+            @Override
+            public void setLocale(Locale loc) {
+                from.setLocale(loc);
+            }
+
+            @Override
+            public Locale getLocale() {
+                return from.getLocale();
+            }
+
+            @Override
+            public jakarta.servlet.ServletResponse toJakartaServletResponse() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletResponseWrapper.java b/core/src/main/java/javax/servlet/ServletResponseWrapper.java
new file mode 100644
index 0000000000..5862c07bbf
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletResponseWrapper.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Locale;
+
+public class ServletResponseWrapper implements ServletResponse {
+    private ServletResponse response;
+
+    public ServletResponseWrapper(ServletResponse response) {
+        if (response == null) {
+            throw new IllegalArgumentException("Response cannot be null");
+        }
+        this.response = response;
+    }
+
+    public ServletResponse getResponse() {
+        return this.response;
+    }
+
+    public void setResponse(ServletResponse response) {
+        if (response == null) {
+            throw new IllegalArgumentException("Response cannot be null");
+        }
+        this.response = response;
+    }
+
+    @Override
+    public void setCharacterEncoding(String charset) {
+        this.response.setCharacterEncoding(charset);
+    }
+
+    @Override
+    public String getCharacterEncoding() {
+        return this.response.getCharacterEncoding();
+    }
+
+    @Override
+    @WithBridgeMethods(value = ServletOutputStream.class, adapterMethod = "fromJakartaServletOutputStream")
+    public jakarta.servlet.ServletOutputStream getOutputStream() throws IOException {
+        return this.response.getOutputStream();
+    }
+
+    private Object fromJakartaServletOutputStream(jakarta.servlet.ServletOutputStream outputStream, Class<?> type) {
+        return ServletOutputStream.fromJakartaServletOutputStream(outputStream);
+    }
+
+    @Override
+    public PrintWriter getWriter() throws IOException {
+        return this.response.getWriter();
+    }
+
+    @Override
+    public void setContentLength(int len) {
+        this.response.setContentLength(len);
+    }
+
+    @Override
+    public void setContentLengthLong(long len) {
+        this.response.setContentLengthLong(len);
+    }
+
+    @Override
+    public void setContentType(String type) {
+        this.response.setContentType(type);
+    }
+
+    @Override
+    public String getContentType() {
+        return this.response.getContentType();
+    }
+
+    @Override
+    public void setBufferSize(int size) {
+        this.response.setBufferSize(size);
+    }
+
+    @Override
+    public int getBufferSize() {
+        return this.response.getBufferSize();
+    }
+
+    @Override
+    public void flushBuffer() throws IOException {
+        this.response.flushBuffer();
+    }
+
+    @Override
+    public boolean isCommitted() {
+        return this.response.isCommitted();
+    }
+
+    @Override
+    public void reset() {
+        this.response.reset();
+    }
+
+    @Override
+    public void resetBuffer() {
+        this.response.resetBuffer();
+    }
+
+    @Override
+    public void setLocale(Locale loc) {
+        this.response.setLocale(loc);
+    }
+
+    @Override
+    public Locale getLocale() {
+        return this.response.getLocale();
+    }
+
+    public boolean isWrapperFor(ServletResponse wrapped) {
+        if (response == wrapped) {
+            return true;
+        } else if (response instanceof ServletResponseWrapper) {
+            return ((ServletResponseWrapper) response).isWrapperFor(wrapped);
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isWrapperFor(Class<?> wrappedType) {
+        if (!ServletResponse.class.isAssignableFrom(wrappedType)) {
+            throw new IllegalArgumentException("Given class " + wrappedType.getName() + " not a subinterface of "
+                    + ServletResponse.class.getName());
+        }
+        if (wrappedType.isAssignableFrom(response.getClass())) {
+            return true;
+        } else if (response instanceof ServletResponseWrapper) {
+            return ((ServletResponseWrapper) response).isWrapperFor(wrappedType);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/core/src/main/java/javax/servlet/ServletSecurityElement.java b/core/src/main/java/javax/servlet/ServletSecurityElement.java
new file mode 100644
index 0000000000..8ce9331003
--- /dev/null
+++ b/core/src/main/java/javax/servlet/ServletSecurityElement.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import javax.servlet.annotation.HttpMethodConstraint;
+import javax.servlet.annotation.ServletSecurity;
+
+public class ServletSecurityElement extends HttpConstraintElement {
+    private Collection<String> methodNames;
+    private Collection<HttpMethodConstraintElement> methodConstraints;
+
+    public ServletSecurityElement() {
+        methodConstraints = new HashSet<>();
+        methodNames = Collections.emptySet();
+    }
+
+    public ServletSecurityElement(HttpConstraintElement constraint) {
+        super(constraint.getEmptyRoleSemantic(), constraint.getTransportGuarantee(), constraint.getRolesAllowed());
+        methodConstraints = new HashSet<>();
+        methodNames = Collections.emptySet();
+    }
+
+    public ServletSecurityElement(Collection<HttpMethodConstraintElement> methodConstraints) {
+        this.methodConstraints = (methodConstraints == null ? new HashSet<>() : methodConstraints);
+        methodNames = checkMethodNames(this.methodConstraints);
+    }
+
+    public ServletSecurityElement(
+            HttpConstraintElement constraint, Collection<HttpMethodConstraintElement> methodConstraints) {
+        super(constraint.getEmptyRoleSemantic(), constraint.getTransportGuarantee(), constraint.getRolesAllowed());
+        this.methodConstraints = (methodConstraints == null ? new HashSet<>() : methodConstraints);
+        methodNames = checkMethodNames(this.methodConstraints);
+    }
+
+    public ServletSecurityElement(ServletSecurity annotation) {
+        super(
+                annotation.value().value(),
+                annotation.value().transportGuarantee(),
+                annotation.value().rolesAllowed());
+        this.methodConstraints = new HashSet<>();
+        for (HttpMethodConstraint constraint : annotation.httpMethodConstraints()) {
+            this.methodConstraints.add(new HttpMethodConstraintElement(
+                    constraint.value(),
+                    new HttpConstraintElement(
+                            constraint.emptyRoleSemantic(),
+                            constraint.transportGuarantee(),
+                            constraint.rolesAllowed())));
+        }
+        methodNames = checkMethodNames(this.methodConstraints);
+    }
+
+    public Collection<HttpMethodConstraintElement> getHttpMethodConstraints() {
+        return Collections.unmodifiableCollection(methodConstraints);
+    }
+
+    public Collection<String> getMethodNames() {
+        return Collections.unmodifiableCollection(methodNames);
+    }
+
+    private Collection<String> checkMethodNames(Collection<HttpMethodConstraintElement> methodConstraints) {
+        Collection<String> methodNames = new HashSet<>();
+        for (HttpMethodConstraintElement methodConstraint : methodConstraints) {
+            String methodName = methodConstraint.getMethodName();
+            if (!methodNames.add(methodName)) {
+                throw new IllegalArgumentException("Duplicate HTTP method name: " + methodName);
+            }
+        }
+        return methodNames;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/SessionCookieConfig.java b/core/src/main/java/javax/servlet/SessionCookieConfig.java
new file mode 100644
index 0000000000..b5de1c90f8
--- /dev/null
+++ b/core/src/main/java/javax/servlet/SessionCookieConfig.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+public interface SessionCookieConfig {
+    void setName(String name);
+
+    String getName();
+
+    void setDomain(String domain);
+
+    String getDomain();
+
+    void setPath(String path);
+
+    String getPath();
+
+    void setComment(String comment);
+
+    String getComment();
+
+    void setHttpOnly(boolean httpOnly);
+
+    boolean isHttpOnly();
+
+    void setSecure(boolean secure);
+
+    boolean isSecure();
+
+    void setMaxAge(int maxAge);
+
+    int getMaxAge();
+
+    default jakarta.servlet.SessionCookieConfig toJakartaSessionCookieConfig() {
+        return new jakarta.servlet.SessionCookieConfig() {
+            @Override
+            public void setName(String name) {
+                SessionCookieConfig.this.setName(name);
+            }
+
+            @Override
+            public String getName() {
+                return SessionCookieConfig.this.getName();
+            }
+
+            @Override
+            public void setDomain(String domain) {
+                SessionCookieConfig.this.setDomain(domain);
+            }
+
+            @Override
+            public String getDomain() {
+                return SessionCookieConfig.this.getDomain();
+            }
+
+            @Override
+            public void setPath(String path) {
+                SessionCookieConfig.this.setPath(path);
+            }
+
+            @Override
+            public String getPath() {
+                return SessionCookieConfig.this.getPath();
+            }
+
+            @Override
+            public void setComment(String comment) {
+                SessionCookieConfig.this.setComment(comment);
+            }
+
+            @Override
+            public String getComment() {
+                return SessionCookieConfig.this.getComment();
+            }
+
+            @Override
+            public void setHttpOnly(boolean httpOnly) {
+                SessionCookieConfig.this.setHttpOnly(httpOnly);
+            }
+
+            @Override
+            public boolean isHttpOnly() {
+                return SessionCookieConfig.this.isHttpOnly();
+            }
+
+            @Override
+            public void setSecure(boolean secure) {
+                SessionCookieConfig.this.setSecure(secure);
+            }
+
+            @Override
+            public boolean isSecure() {
+                return SessionCookieConfig.this.isSecure();
+            }
+
+            @Override
+            public void setMaxAge(int maxAge) {
+                SessionCookieConfig.this.setMaxAge(maxAge);
+            }
+
+            @Override
+            public int getMaxAge() {
+                return SessionCookieConfig.this.getMaxAge();
+            }
+        };
+    }
+
+    static SessionCookieConfig fromJakartaSessionCookieConfig(jakarta.servlet.SessionCookieConfig from) {
+        return new SessionCookieConfig() {
+            @Override
+            public void setName(String name) {
+                from.setName(name);
+            }
+
+            @Override
+            public String getName() {
+                return from.getName();
+            }
+
+            @Override
+            public void setDomain(String domain) {
+                from.setDomain(domain);
+            }
+
+            @Override
+            public String getDomain() {
+                return from.getDomain();
+            }
+
+            @Override
+            public void setPath(String path) {
+                from.setPath(path);
+            }
+
+            @Override
+            public String getPath() {
+                return from.getPath();
+            }
+
+            @Override
+            public void setComment(String comment) {
+                from.setComment(comment);
+            }
+
+            @Override
+            public String getComment() {
+                return from.getComment();
+            }
+
+            @Override
+            public void setHttpOnly(boolean httpOnly) {
+                from.setHttpOnly(httpOnly);
+            }
+
+            @Override
+            public boolean isHttpOnly() {
+                return from.isHttpOnly();
+            }
+
+            @Override
+            public void setSecure(boolean secure) {
+                from.setSecure(secure);
+            }
+
+            @Override
+            public boolean isSecure() {
+                return from.isSecure();
+            }
+
+            @Override
+            public void setMaxAge(int maxAge) {
+                from.setMaxAge(maxAge);
+            }
+
+            @Override
+            public int getMaxAge() {
+                return from.getMaxAge();
+            }
+
+            @Override
+            public jakarta.servlet.SessionCookieConfig toJakartaSessionCookieConfig() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/SessionTrackingMode.java b/core/src/main/java/javax/servlet/SessionTrackingMode.java
new file mode 100644
index 0000000000..6dcef3c9bd
--- /dev/null
+++ b/core/src/main/java/javax/servlet/SessionTrackingMode.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+public enum SessionTrackingMode {
+    COOKIE,
+    URL,
+    SSL;
+
+    public static jakarta.servlet.SessionTrackingMode toJakartaSessionTrackingMode(SessionTrackingMode from) {
+        switch (from) {
+            case COOKIE:
+                return jakarta.servlet.SessionTrackingMode.COOKIE;
+            case URL:
+                return jakarta.servlet.SessionTrackingMode.URL;
+            case SSL:
+                return jakarta.servlet.SessionTrackingMode.SSL;
+            default:
+                throw new IllegalArgumentException("Unknown SessionTrackingMode: " + from);
+        }
+    }
+
+    public static SessionTrackingMode fromJakartaSessionTrackingMode(jakarta.servlet.SessionTrackingMode from) {
+        switch (from) {
+            case COOKIE:
+                return SessionTrackingMode.COOKIE;
+            case URL:
+                return SessionTrackingMode.URL;
+            case SSL:
+                return SessionTrackingMode.SSL;
+            default:
+                throw new IllegalArgumentException("Unknown SessionTrackingMode: " + from);
+        }
+    }
+}
diff --git a/core/src/main/java/javax/servlet/SingleThreadModel.java b/core/src/main/java/javax/servlet/SingleThreadModel.java
new file mode 100644
index 0000000000..4f5d87b67e
--- /dev/null
+++ b/core/src/main/java/javax/servlet/SingleThreadModel.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+@Deprecated
+public interface SingleThreadModel {}
diff --git a/core/src/main/java/javax/servlet/UnavailableException.java b/core/src/main/java/javax/servlet/UnavailableException.java
new file mode 100644
index 0000000000..8a4a93d6f7
--- /dev/null
+++ b/core/src/main/java/javax/servlet/UnavailableException.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet;
+
+public class UnavailableException extends ServletException {
+    private static final long serialVersionUID = 5622686609215003468L;
+
+    private Servlet servlet;
+    private boolean permanent;
+    private int seconds;
+
+    @Deprecated
+    public UnavailableException(Servlet servlet, String msg) {
+        super(msg);
+        this.servlet = servlet;
+        permanent = true;
+    }
+
+    @Deprecated
+    public UnavailableException(int seconds, Servlet servlet, String msg) {
+        super(msg);
+        this.servlet = servlet;
+        if (seconds <= 0) this.seconds = -1;
+        else this.seconds = seconds;
+        permanent = false;
+    }
+
+    public UnavailableException(String msg) {
+        super(msg);
+
+        permanent = true;
+    }
+
+    public UnavailableException(String msg, int seconds) {
+        super(msg);
+
+        if (seconds <= 0) this.seconds = -1;
+        else this.seconds = seconds;
+
+        permanent = false;
+    }
+
+    public boolean isPermanent() {
+        return permanent;
+    }
+
+    @Deprecated
+    public Servlet getServlet() {
+        return servlet;
+    }
+
+    public int getUnavailableSeconds() {
+        return permanent ? -1 : seconds;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/WriteListener.java b/core/src/main/java/javax/servlet/WriteListener.java
new file mode 100644
index 0000000000..4b6f1d8b47
--- /dev/null
+++ b/core/src/main/java/javax/servlet/WriteListener.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet;
+
+import java.io.IOException;
+import java.util.EventListener;
+
+public interface WriteListener extends EventListener {
+    void onWritePossible() throws IOException;
+
+    void onError(final Throwable t);
+
+    default jakarta.servlet.WriteListener toJakartaWriteListener() {
+        return new jakarta.servlet.WriteListener() {
+            @Override
+            public void onWritePossible() throws IOException {
+                WriteListener.this.onWritePossible();
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                WriteListener.this.onError(t);
+            }
+        };
+    }
+
+    static WriteListener fromJakartaWriteListener(jakarta.servlet.WriteListener from) {
+        return new WriteListener() {
+            @Override
+            public void onWritePossible() throws IOException {
+                from.onWritePossible();
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                from.onError(t);
+            }
+
+            @Override
+            public jakarta.servlet.WriteListener toJakartaWriteListener() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/annotation/HandlesTypes.java b/core/src/main/java/javax/servlet/annotation/HandlesTypes.java
new file mode 100644
index 0000000000..a3e096a638
--- /dev/null
+++ b/core/src/main/java/javax/servlet/annotation/HandlesTypes.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HandlesTypes {
+    Class<?>[] value();
+}
diff --git a/core/src/main/java/javax/servlet/annotation/HttpConstraint.java b/core/src/main/java/javax/servlet/annotation/HttpConstraint.java
new file mode 100644
index 0000000000..8352a4a7be
--- /dev/null
+++ b/core/src/main/java/javax/servlet/annotation/HttpConstraint.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
+import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HttpConstraint {
+    EmptyRoleSemantic value() default EmptyRoleSemantic.PERMIT;
+
+    TransportGuarantee transportGuarantee() default TransportGuarantee.NONE;
+
+    String[] rolesAllowed() default {};
+}
diff --git a/core/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java b/core/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java
new file mode 100644
index 0000000000..5e56cf6a9a
--- /dev/null
+++ b/core/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import javax.servlet.annotation.ServletSecurity.EmptyRoleSemantic;
+import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HttpMethodConstraint {
+    String value();
+
+    EmptyRoleSemantic emptyRoleSemantic() default EmptyRoleSemantic.PERMIT;
+
+    TransportGuarantee transportGuarantee() default TransportGuarantee.NONE;
+
+    String[] rolesAllowed() default {};
+}
diff --git a/core/src/main/java/javax/servlet/annotation/MultipartConfig.java b/core/src/main/java/javax/servlet/annotation/MultipartConfig.java
new file mode 100644
index 0000000000..1fbcc3c913
--- /dev/null
+++ b/core/src/main/java/javax/servlet/annotation/MultipartConfig.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MultipartConfig {
+    String location() default "";
+
+    long maxFileSize() default -1L;
+
+    long maxRequestSize() default -1L;
+
+    int fileSizeThreshold() default 0;
+}
diff --git a/core/src/main/java/javax/servlet/annotation/ServletSecurity.java b/core/src/main/java/javax/servlet/annotation/ServletSecurity.java
new file mode 100644
index 0000000000..3846b3b882
--- /dev/null
+++ b/core/src/main/java/javax/servlet/annotation/ServletSecurity.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Inherited
+@Documented
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ServletSecurity {
+    enum EmptyRoleSemantic {
+        PERMIT,
+
+        DENY
+    }
+
+    enum TransportGuarantee {
+        NONE,
+
+        CONFIDENTIAL
+    }
+
+    HttpConstraint value() default @HttpConstraint;
+
+    HttpMethodConstraint[] httpMethodConstraints() default {};
+}
diff --git a/core/src/main/java/javax/servlet/annotation/WebFilter.java b/core/src/main/java/javax/servlet/annotation/WebFilter.java
new file mode 100644
index 0000000000..11b852d47d
--- /dev/null
+++ b/core/src/main/java/javax/servlet/annotation/WebFilter.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.servlet.DispatcherType;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface WebFilter {
+    String description() default "";
+
+    String displayName() default "";
+
+    WebInitParam[] initParams() default {};
+
+    String filterName() default "";
+
+    String smallIcon() default "";
+
+    String largeIcon() default "";
+
+    String[] servletNames() default {};
+
+    String[] value() default {};
+
+    String[] urlPatterns() default {};
+
+    DispatcherType[] dispatcherTypes() default {DispatcherType.REQUEST};
+
+    boolean asyncSupported() default false;
+}
diff --git a/core/src/main/java/javax/servlet/annotation/WebInitParam.java b/core/src/main/java/javax/servlet/annotation/WebInitParam.java
new file mode 100644
index 0000000000..a6f923fa36
--- /dev/null
+++ b/core/src/main/java/javax/servlet/annotation/WebInitParam.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface WebInitParam {
+    String name();
+
+    String value();
+
+    String description() default "";
+}
diff --git a/core/src/main/java/javax/servlet/annotation/WebListener.java b/core/src/main/java/javax/servlet/annotation/WebListener.java
new file mode 100644
index 0000000000..8dfcd6d978
--- /dev/null
+++ b/core/src/main/java/javax/servlet/annotation/WebListener.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface WebListener {
+    String value() default "";
+}
diff --git a/core/src/main/java/javax/servlet/annotation/WebServlet.java b/core/src/main/java/javax/servlet/annotation/WebServlet.java
new file mode 100644
index 0000000000..edcc001a15
--- /dev/null
+++ b/core/src/main/java/javax/servlet/annotation/WebServlet.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface WebServlet {
+    String name() default "";
+
+    String[] value() default {};
+
+    String[] urlPatterns() default {};
+
+    int loadOnStartup() default -1;
+
+    WebInitParam[] initParams() default {};
+
+    boolean asyncSupported() default false;
+
+    String smallIcon() default "";
+
+    String largeIcon() default "";
+
+    String description() default "";
+
+    String displayName() default "";
+}
diff --git a/core/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java b/core/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
new file mode 100644
index 0000000000..28d05581b8
--- /dev/null
+++ b/core/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.descriptor;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+public interface JspConfigDescriptor {
+    Collection<TaglibDescriptor> getTaglibs();
+
+    Collection<JspPropertyGroupDescriptor> getJspPropertyGroups();
+
+    default jakarta.servlet.descriptor.JspConfigDescriptor toJakartaJspConfigDescriptor() {
+        return new jakarta.servlet.descriptor.JspConfigDescriptor() {
+            @Override
+            public Collection<jakarta.servlet.descriptor.TaglibDescriptor> getTaglibs() {
+                return JspConfigDescriptor.this.getTaglibs().stream()
+                        .map(TaglibDescriptor::toJakartaTaglibDescriptor)
+                        .collect(Collectors.toList());
+            }
+
+            @Override
+            public Collection<jakarta.servlet.descriptor.JspPropertyGroupDescriptor> getJspPropertyGroups() {
+                return JspConfigDescriptor.this.getJspPropertyGroups().stream()
+                        .map(JspPropertyGroupDescriptor::toJakartaJspPropertyGroupDescriptor)
+                        .collect(Collectors.toList());
+            }
+        };
+    }
+
+    static JspConfigDescriptor fromJakartaJspConfigDescriptor(jakarta.servlet.descriptor.JspConfigDescriptor from) {
+        return new JspConfigDescriptor() {
+            @Override
+            public Collection<TaglibDescriptor> getTaglibs() {
+                return from.getTaglibs().stream()
+                        .map(TaglibDescriptor::fromJakartaTaglibDescriptor)
+                        .collect(Collectors.toList());
+            }
+
+            @Override
+            public Collection<JspPropertyGroupDescriptor> getJspPropertyGroups() {
+                return from.getJspPropertyGroups().stream()
+                        .map(JspPropertyGroupDescriptor::fromJakartaJspPropertyGroupDescriptor)
+                        .collect(Collectors.toList());
+            }
+
+            @Override
+            public jakarta.servlet.descriptor.JspConfigDescriptor toJakartaJspConfigDescriptor() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java b/core/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
new file mode 100644
index 0000000000..0bf6b5caaa
--- /dev/null
+++ b/core/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.descriptor;
+
+import java.util.Collection;
+
+public interface JspPropertyGroupDescriptor {
+    Collection<String> getUrlPatterns();
+
+    String getElIgnored();
+
+    String getPageEncoding();
+
+    String getScriptingInvalid();
+
+    String getIsXml();
+
+    Collection<String> getIncludePreludes();
+
+    Collection<String> getIncludeCodas();
+
+    String getDeferredSyntaxAllowedAsLiteral();
+
+    String getTrimDirectiveWhitespaces();
+
+    String getDefaultContentType();
+
+    String getBuffer();
+
+    String getErrorOnUndeclaredNamespace();
+
+    default jakarta.servlet.descriptor.JspPropertyGroupDescriptor toJakartaJspPropertyGroupDescriptor() {
+        return new jakarta.servlet.descriptor.JspPropertyGroupDescriptor() {
+            @Override
+            public Collection<String> getUrlPatterns() {
+                return JspPropertyGroupDescriptor.this.getUrlPatterns();
+            }
+
+            @Override
+            public String getElIgnored() {
+                return JspPropertyGroupDescriptor.this.getElIgnored();
+            }
+
+            @Override
+            public String getPageEncoding() {
+                return JspPropertyGroupDescriptor.this.getPageEncoding();
+            }
+
+            @Override
+            public String getScriptingInvalid() {
+                return JspPropertyGroupDescriptor.this.getScriptingInvalid();
+            }
+
+            @Override
+            public String getIsXml() {
+                return JspPropertyGroupDescriptor.this.getIsXml();
+            }
+
+            @Override
+            public Collection<String> getIncludePreludes() {
+                return JspPropertyGroupDescriptor.this.getIncludePreludes();
+            }
+
+            @Override
+            public Collection<String> getIncludeCodas() {
+                return JspPropertyGroupDescriptor.this.getIncludeCodas();
+            }
+
+            @Override
+            public String getDeferredSyntaxAllowedAsLiteral() {
+                return JspPropertyGroupDescriptor.this.getDeferredSyntaxAllowedAsLiteral();
+            }
+
+            @Override
+            public String getTrimDirectiveWhitespaces() {
+                return JspPropertyGroupDescriptor.this.getTrimDirectiveWhitespaces();
+            }
+
+            @Override
+            public String getDefaultContentType() {
+                return JspPropertyGroupDescriptor.this.getDefaultContentType();
+            }
+
+            @Override
+            public String getBuffer() {
+                return JspPropertyGroupDescriptor.this.getBuffer();
+            }
+
+            @Override
+            public String getErrorOnUndeclaredNamespace() {
+                return JspPropertyGroupDescriptor.this.getErrorOnUndeclaredNamespace();
+            }
+        };
+    }
+
+    static JspPropertyGroupDescriptor fromJakartaJspPropertyGroupDescriptor(
+            jakarta.servlet.descriptor.JspPropertyGroupDescriptor from) {
+        return new JspPropertyGroupDescriptor() {
+            @Override
+            public Collection<String> getUrlPatterns() {
+                return from.getUrlPatterns();
+            }
+
+            @Override
+            public String getElIgnored() {
+                return from.getElIgnored();
+            }
+
+            @Override
+            public String getPageEncoding() {
+                return from.getPageEncoding();
+            }
+
+            @Override
+            public String getScriptingInvalid() {
+                return from.getScriptingInvalid();
+            }
+
+            @Override
+            public String getIsXml() {
+                return from.getIsXml();
+            }
+
+            @Override
+            public Collection<String> getIncludePreludes() {
+                return from.getIncludePreludes();
+            }
+
+            @Override
+            public Collection<String> getIncludeCodas() {
+                return from.getIncludeCodas();
+            }
+
+            @Override
+            public String getDeferredSyntaxAllowedAsLiteral() {
+                return from.getDeferredSyntaxAllowedAsLiteral();
+            }
+
+            @Override
+            public String getTrimDirectiveWhitespaces() {
+                return from.getTrimDirectiveWhitespaces();
+            }
+
+            @Override
+            public String getDefaultContentType() {
+                return from.getDefaultContentType();
+            }
+
+            @Override
+            public String getBuffer() {
+                return from.getBuffer();
+            }
+
+            @Override
+            public String getErrorOnUndeclaredNamespace() {
+                return from.getErrorOnUndeclaredNamespace();
+            }
+
+            @Override
+            public jakarta.servlet.descriptor.JspPropertyGroupDescriptor toJakartaJspPropertyGroupDescriptor() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java b/core/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
new file mode 100644
index 0000000000..a55904b928
--- /dev/null
+++ b/core/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.descriptor;
+
+public interface TaglibDescriptor {
+    String getTaglibURI();
+
+    String getTaglibLocation();
+
+    default jakarta.servlet.descriptor.TaglibDescriptor toJakartaTaglibDescriptor() {
+        return new jakarta.servlet.descriptor.TaglibDescriptor() {
+            @Override
+            public String getTaglibURI() {
+                return TaglibDescriptor.this.getTaglibURI();
+            }
+
+            @Override
+            public String getTaglibLocation() {
+                return TaglibDescriptor.this.getTaglibLocation();
+            }
+        };
+    }
+
+    static TaglibDescriptor fromJakartaTaglibDescriptor(jakarta.servlet.descriptor.TaglibDescriptor from) {
+        return new TaglibDescriptor() {
+            @Override
+            public String getTaglibURI() {
+                return from.getTaglibURI();
+            }
+
+            @Override
+            public String getTaglibLocation() {
+                return from.getTaglibLocation();
+            }
+
+            @Override
+            public jakarta.servlet.descriptor.TaglibDescriptor toJakartaTaglibDescriptor() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/Cookie.java b/core/src/main/java/javax/servlet/http/Cookie.java
new file mode 100644
index 0000000000..fda3c326f1
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/Cookie.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class Cookie implements Cloneable, Serializable {
+    private static final long serialVersionUID = -6454587001725327448L;
+
+    private static final String TSPECIALS;
+
+    private static final String LSTRING_FILE = "javax.servlet.http.LocalStrings";
+
+    private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE);
+
+    static {
+        if (Boolean.valueOf(System.getProperty("org.glassfish.web.rfc2109_cookie_names_enforced", "true"))
+                .booleanValue()) {
+            TSPECIALS = "/()<>@,;:\\\"[]?={} \t";
+        } else {
+            TSPECIALS = ",; ";
+        }
+    }
+
+    private String name;
+    private String value;
+
+    private String comment;
+
+    private String domain;
+    private int maxAge = -1;
+    private String path;
+    private boolean secure;
+    private int version = 0;
+    private boolean isHttpOnly = false;
+
+    public Cookie(String name, String value) {
+        if (name == null || name.length() == 0) {
+            throw new IllegalArgumentException(lStrings.getString("err.cookie_name_blank"));
+        }
+        if (!isToken(name)
+                || name.equalsIgnoreCase("Comment")
+                || name.equalsIgnoreCase("Discard")
+                || name.equalsIgnoreCase("Domain")
+                || name.equalsIgnoreCase("Expires")
+                || name.equalsIgnoreCase("Max-Age")
+                || name.equalsIgnoreCase("Path")
+                || name.equalsIgnoreCase("Secure")
+                || name.equalsIgnoreCase("Version")
+                || name.startsWith("$")) {
+            String errMsg = lStrings.getString("err.cookie_name_is_token");
+            Object[] errArgs = new Object[1];
+            errArgs[0] = name;
+            errMsg = MessageFormat.format(errMsg, errArgs);
+            throw new IllegalArgumentException(errMsg);
+        }
+
+        this.name = name;
+        this.value = value;
+    }
+
+    public void setComment(String purpose) {
+        comment = purpose;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain.toLowerCase(Locale.ENGLISH);
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setMaxAge(int expiry) {
+        maxAge = expiry;
+    }
+
+    public int getMaxAge() {
+        return maxAge;
+    }
+
+    public void setPath(String uri) {
+        path = uri;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setSecure(boolean flag) {
+        secure = flag;
+    }
+
+    public boolean getSecure() {
+        return secure;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setValue(String newValue) {
+        value = newValue;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int v) {
+        version = v;
+    }
+
+    private boolean isToken(String value) {
+        int len = value.length();
+        for (int i = 0; i < len; i++) {
+            char c = value.charAt(i);
+            if (c < 0x20 || c >= 0x7f || TSPECIALS.indexOf(c) != -1) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public Object clone() {
+        try {
+            return super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+    public void setHttpOnly(boolean isHttpOnly) {
+        this.isHttpOnly = isHttpOnly;
+    }
+
+    public boolean isHttpOnly() {
+        return isHttpOnly;
+    }
+
+    @SuppressFBWarnings(
+            value = {"INSECURE_COOKIE", "HTTPONLY_COOKIE"},
+            justification = "intentional copying")
+    public static jakarta.servlet.http.Cookie toJakartaServletHttpCookie(Cookie from) {
+        jakarta.servlet.http.Cookie result = new jakarta.servlet.http.Cookie(from.getName(), from.getValue());
+        if (from.getComment() != null) {
+            result.setComment(from.getComment());
+        }
+        if (from.getDomain() != null) {
+            result.setDomain(from.getDomain());
+        }
+        result.setMaxAge(from.getMaxAge());
+        if (from.getPath() != null) {
+            result.setPath(from.getPath());
+        }
+        result.setSecure(from.getSecure());
+        result.setVersion(from.getVersion());
+        result.setHttpOnly(from.isHttpOnly());
+        return result;
+    }
+
+    @SuppressFBWarnings(
+            value = {"INSECURE_COOKIE", "HTTPONLY_COOKIE"},
+            justification = "intentional copying")
+    public static Cookie fromJakartaServletHttpCookie(jakarta.servlet.http.Cookie from) {
+        Cookie result = new Cookie(from.getName(), from.getValue());
+        if (from.getComment() != null) {
+            result.setComment(from.getComment());
+        }
+        if (from.getDomain() != null) {
+            result.setDomain(from.getDomain());
+        }
+        result.setMaxAge(from.getMaxAge());
+        if (from.getPath() != null) {
+            result.setPath(from.getPath());
+        }
+        result.setSecure(from.getSecure());
+        result.setVersion(from.getVersion());
+        result.setHttpOnly(from.isHttpOnly());
+        return result;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpFilter.java b/core/src/main/java/javax/servlet/http/HttpFilter.java
new file mode 100644
index 0000000000..93b4dc37c1
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpFilter.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.http;
+
+import java.io.IOException;
+import javax.servlet.FilterChain;
+import javax.servlet.GenericFilter;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+public abstract class HttpFilter extends GenericFilter {
+    private static final long serialVersionUID = 7478463438252262094L;
+
+    public HttpFilter() {}
+
+    @Override
+    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+            throws IOException, ServletException {
+        if (!(req instanceof HttpServletRequest && res instanceof HttpServletResponse)) {
+            throw new ServletException("non-HTTP request or response");
+        }
+
+        this.doFilter((HttpServletRequest) req, (HttpServletResponse) res, chain);
+    }
+
+    protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain)
+            throws IOException, ServletException {
+        chain.doFilter(req, res);
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpServletMapping.java b/core/src/main/java/javax/servlet/http/HttpServletMapping.java
new file mode 100644
index 0000000000..ab8a30d47c
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpServletMapping.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2017, 2019 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.http;
+
+public interface HttpServletMapping {
+    String getMatchValue();
+
+    String getPattern();
+
+    String getServletName();
+
+    MappingMatch getMappingMatch();
+
+    default jakarta.servlet.http.HttpServletMapping toJakartaHttpServletMapping() {
+        return new jakarta.servlet.http.HttpServletMapping() {
+            @Override
+            public String getMatchValue() {
+                return HttpServletMapping.this.getMatchValue();
+            }
+
+            @Override
+            public String getPattern() {
+                return HttpServletMapping.this.getPattern();
+            }
+
+            @Override
+            public String getServletName() {
+                return HttpServletMapping.this.getServletName();
+            }
+
+            @Override
+            public jakarta.servlet.http.MappingMatch getMappingMatch() {
+                return MappingMatch.toJakartaMappingMatch(HttpServletMapping.this.getMappingMatch());
+            }
+        };
+    }
+
+    static HttpServletMapping fromJakartaHttpServletMapping(jakarta.servlet.http.HttpServletMapping from) {
+        return new HttpServletMapping() {
+            @Override
+            public String getMatchValue() {
+                return from.getMatchValue();
+            }
+
+            @Override
+            public String getPattern() {
+                return from.getPattern();
+            }
+
+            @Override
+            public String getServletName() {
+                return from.getServletName();
+            }
+
+            @Override
+            public MappingMatch getMappingMatch() {
+                return MappingMatch.fromJakartaMappingMatch(from.getMappingMatch());
+            }
+
+            @Override
+            public jakarta.servlet.http.HttpServletMapping toJakartaHttpServletMapping() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpServletRequest.java b/core/src/main/java/javax/servlet/http/HttpServletRequest.java
new file mode 100644
index 0000000000..f67e700f16
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -0,0 +1,984 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Stream;
+import javax.servlet.DispatcherType;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+
+public interface HttpServletRequest extends ServletRequest {
+    String BASIC_AUTH = "BASIC";
+
+    String FORM_AUTH = "FORM";
+
+    String CLIENT_CERT_AUTH = "CLIENT_CERT";
+
+    String DIGEST_AUTH = "DIGEST";
+
+    String getAuthType();
+
+    @WithBridgeMethods(Cookie[].class)
+    jakarta.servlet.http.Cookie[] getCookies();
+
+    long getDateHeader(String name);
+
+    String getHeader(String name);
+
+    Enumeration<String> getHeaders(String name);
+
+    Enumeration<String> getHeaderNames();
+
+    int getIntHeader(String name);
+
+    //    default jakarta.servlet.http.HttpServletMapping getHttpServletMapping() {
+    //        return new jakarta.servlet.http.HttpServletMapping() {
+    //            @Override
+    //            public String getMatchValue() {
+    //                return "";
+    //            }
+    //
+    //            @Override
+    //            public String getPattern() {
+    //                return "";
+    //            }
+    //
+    //            @Override
+    //            public String getServletName() {
+    //                return "";
+    //            }
+    //
+    //            @Override
+    //            public jakarta.servlet.http.MappingMatch getMappingMatch() {
+    //                return null;
+    //            }
+    //
+    //            @Override
+    //            public String toString() {
+    //                return "MappingImpl{" + "matchValue=" + getMatchValue() + ", pattern=" + getPattern() + ",
+    // servletName="
+    //                        + getServletName() + ", mappingMatch=" + getMappingMatch() + "} HttpServletRequest {"
+    //                        + HttpServletRequest.this.toString() + '}';
+    //            }
+    //        };
+    //    }
+
+    private Object fromJakartaHttpServletMapping(
+            jakarta.servlet.http.HttpServletMapping httpServletMapping, Class<?> type) {
+        return HttpServletMapping.fromJakartaHttpServletMapping(httpServletMapping);
+    }
+
+    String getMethod();
+
+    String getPathInfo();
+
+    String getPathTranslated();
+
+    // default PushBuilder newPushBuilder() {
+    //    return null;
+    // }
+
+    String getContextPath();
+
+    String getQueryString();
+
+    String getRemoteUser();
+
+    boolean isUserInRole(String role);
+
+    java.security.Principal getUserPrincipal();
+
+    String getRequestedSessionId();
+
+    String getRequestURI();
+
+    StringBuffer getRequestURL();
+
+    String getServletPath();
+
+    @WithBridgeMethods(HttpSession.class)
+    jakarta.servlet.http.HttpSession getSession(boolean create);
+
+    @WithBridgeMethods(HttpSession.class)
+    jakarta.servlet.http.HttpSession getSession();
+
+    String changeSessionId();
+
+    boolean isRequestedSessionIdValid();
+
+    boolean isRequestedSessionIdFromCookie();
+
+    boolean isRequestedSessionIdFromURL();
+
+    @Deprecated
+    boolean isRequestedSessionIdFromUrl();
+
+    boolean authenticate(HttpServletResponse response) throws IOException, ServletException;
+
+    // void login(String username, String password) throws ServletException;
+
+    // void logout() throws ServletException;
+
+    Collection<jakarta.servlet.http.Part> getParts() throws IOException, jakarta.servlet.ServletException;
+
+    @WithBridgeMethods(Part.class)
+    jakarta.servlet.http.Part getPart(String name) throws IOException, jakarta.servlet.ServletException;
+
+    // <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException;
+
+    // default Map<String, String> getTrailerFields() {
+    //    return Collections.emptyMap();
+    // }
+
+    // default boolean isTrailerFieldsReady() {
+    //    return true;
+    // }
+
+    default jakarta.servlet.http.HttpServletRequest toJakartaHttpServletRequest() {
+        return new jakarta.servlet.http.HttpServletRequest() {
+            @Override
+            public Object getAttribute(String s) {
+                return HttpServletRequest.this.getAttribute(s);
+            }
+
+            @Override
+            public Enumeration<String> getAttributeNames() {
+                return HttpServletRequest.this.getAttributeNames();
+            }
+
+            @Override
+            public String getCharacterEncoding() {
+                return HttpServletRequest.this.getCharacterEncoding();
+            }
+
+            @Override
+            public void setCharacterEncoding(String s) throws UnsupportedEncodingException {
+                HttpServletRequest.this.setCharacterEncoding(s);
+            }
+
+            @Override
+            public int getContentLength() {
+                return HttpServletRequest.this.getContentLength();
+            }
+
+            @Override
+            public long getContentLengthLong() {
+                return HttpServletRequest.this.getContentLengthLong();
+            }
+
+            @Override
+            public String getContentType() {
+                return HttpServletRequest.this.getContentType();
+            }
+
+            @Override
+            public jakarta.servlet.ServletInputStream getInputStream() throws IOException {
+                return HttpServletRequest.this.getInputStream();
+            }
+
+            @Override
+            public String getParameter(String s) {
+                return HttpServletRequest.this.getParameter(s);
+            }
+
+            @Override
+            public Enumeration<String> getParameterNames() {
+                return HttpServletRequest.this.getParameterNames();
+            }
+
+            @Override
+            public String[] getParameterValues(String s) {
+                return HttpServletRequest.this.getParameterValues(s);
+            }
+
+            @Override
+            public Map<String, String[]> getParameterMap() {
+                return HttpServletRequest.this.getParameterMap();
+            }
+
+            @Override
+            public String getProtocol() {
+                return HttpServletRequest.this.getProtocol();
+            }
+
+            @Override
+            public String getScheme() {
+                return HttpServletRequest.this.getScheme();
+            }
+
+            @Override
+            public String getServerName() {
+                return HttpServletRequest.this.getServerName();
+            }
+
+            @Override
+            public int getServerPort() {
+                return HttpServletRequest.this.getServerPort();
+            }
+
+            @Override
+            public BufferedReader getReader() throws IOException {
+                return HttpServletRequest.this.getReader();
+            }
+
+            @Override
+            public String getRemoteAddr() {
+                return HttpServletRequest.this.getRemoteAddr();
+            }
+
+            @Override
+            public String getRemoteHost() {
+                return HttpServletRequest.this.getRemoteHost();
+            }
+
+            @Override
+            public void setAttribute(String s, Object o) {
+                HttpServletRequest.this.setAttribute(s, o);
+            }
+
+            @Override
+            public void removeAttribute(String s) {
+                HttpServletRequest.this.removeAttribute(s);
+            }
+
+            @Override
+            public Locale getLocale() {
+                return HttpServletRequest.this.getLocale();
+            }
+
+            @Override
+            public Enumeration<Locale> getLocales() {
+                return HttpServletRequest.this.getLocales();
+            }
+
+            @Override
+            public boolean isSecure() {
+                return HttpServletRequest.this.isSecure();
+            }
+
+            @Override
+            public jakarta.servlet.RequestDispatcher getRequestDispatcher(String s) {
+                return HttpServletRequest.this.getRequestDispatcher(s);
+            }
+
+            @Override
+            public String getRealPath(String s) {
+                return HttpServletRequest.this.getRealPath(s);
+            }
+
+            @Override
+            public int getRemotePort() {
+                return HttpServletRequest.this.getRemotePort();
+            }
+
+            @Override
+            public String getLocalName() {
+                return HttpServletRequest.this.getLocalName();
+            }
+
+            @Override
+            public String getLocalAddr() {
+                return HttpServletRequest.this.getLocalAddr();
+            }
+
+            @Override
+            public int getLocalPort() {
+                return HttpServletRequest.this.getLocalPort();
+            }
+
+            @Override
+            public jakarta.servlet.ServletContext getServletContext() {
+                return HttpServletRequest.this.getServletContext();
+            }
+
+            @Override
+            public jakarta.servlet.AsyncContext startAsync() throws IllegalStateException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public jakarta.servlet.AsyncContext startAsync(
+                    jakarta.servlet.ServletRequest servletRequest, jakarta.servlet.ServletResponse servletResponse)
+                    throws IllegalStateException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public boolean isAsyncStarted() {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public boolean isAsyncSupported() {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public jakarta.servlet.AsyncContext getAsyncContext() {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public jakarta.servlet.DispatcherType getDispatcherType() {
+                return HttpServletRequest.this.getDispatcherType();
+            }
+
+            @Override
+            public String getAuthType() {
+                return HttpServletRequest.this.getAuthType();
+            }
+
+            @Override
+            public jakarta.servlet.http.Cookie[] getCookies() {
+                return HttpServletRequest.this.getCookies();
+            }
+
+            @Override
+            public long getDateHeader(String s) {
+                return HttpServletRequest.this.getDateHeader(s);
+            }
+
+            @Override
+            public String getHeader(String s) {
+                return HttpServletRequest.this.getHeader(s);
+            }
+
+            @Override
+            public Enumeration<String> getHeaders(String s) {
+                return HttpServletRequest.this.getHeaders(s);
+            }
+
+            @Override
+            public Enumeration<String> getHeaderNames() {
+                return HttpServletRequest.this.getHeaderNames();
+            }
+
+            @Override
+            public int getIntHeader(String s) {
+                return HttpServletRequest.this.getIntHeader(s);
+            }
+
+            @Override
+            public jakarta.servlet.http.HttpServletMapping getHttpServletMapping() {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public String getMethod() {
+                return HttpServletRequest.this.getMethod();
+            }
+
+            @Override
+            public String getPathInfo() {
+                return HttpServletRequest.this.getPathInfo();
+            }
+
+            @Override
+            public String getPathTranslated() {
+                return HttpServletRequest.this.getPathTranslated();
+            }
+
+            @Override
+            public jakarta.servlet.http.PushBuilder newPushBuilder() {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public String getContextPath() {
+                return HttpServletRequest.this.getContextPath();
+            }
+
+            @Override
+            public String getQueryString() {
+                return HttpServletRequest.this.getQueryString();
+            }
+
+            @Override
+            public String getRemoteUser() {
+                return HttpServletRequest.this.getRemoteUser();
+            }
+
+            @Override
+            public boolean isUserInRole(String s) {
+                return HttpServletRequest.this.isUserInRole(s);
+            }
+
+            @Override
+            public Principal getUserPrincipal() {
+                return HttpServletRequest.this.getUserPrincipal();
+            }
+
+            @Override
+            public String getRequestedSessionId() {
+                return HttpServletRequest.this.getRequestedSessionId();
+            }
+
+            @Override
+            public String getRequestURI() {
+                return HttpServletRequest.this.getRequestURI();
+            }
+
+            @Override
+            public StringBuffer getRequestURL() {
+                return HttpServletRequest.this.getRequestURL();
+            }
+
+            @Override
+            public String getServletPath() {
+                return HttpServletRequest.this.getServletPath();
+            }
+
+            @Override
+            public jakarta.servlet.http.HttpSession getSession(boolean b) {
+                return HttpServletRequest.this.getSession(b);
+            }
+
+            @Override
+            public jakarta.servlet.http.HttpSession getSession() {
+                return HttpServletRequest.this.getSession();
+            }
+
+            @Override
+            public String changeSessionId() {
+                return HttpServletRequest.this.changeSessionId();
+            }
+
+            @Override
+            public boolean isRequestedSessionIdValid() {
+                return HttpServletRequest.this.isRequestedSessionIdValid();
+            }
+
+            @Override
+            public boolean isRequestedSessionIdFromCookie() {
+                return HttpServletRequest.this.isRequestedSessionIdFromCookie();
+            }
+
+            @Override
+            public boolean isRequestedSessionIdFromURL() {
+                return HttpServletRequest.this.isRequestedSessionIdFromURL();
+            }
+
+            @Override
+            public boolean isRequestedSessionIdFromUrl() {
+                return HttpServletRequest.this.isRequestedSessionIdFromUrl();
+            }
+
+            @Override
+            public boolean authenticate(jakarta.servlet.http.HttpServletResponse httpServletResponse)
+                    throws IOException, jakarta.servlet.ServletException {
+                try {
+                    return HttpServletRequest.this.authenticate(
+                            HttpServletResponse.fromJakartaHttpServletResponse(httpServletResponse));
+                } catch (ServletException e) {
+                    throw new jakarta.servlet.ServletException(e);
+                }
+            }
+
+            @Override
+            public void login(String s, String s1) throws jakarta.servlet.ServletException {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public void logout() throws jakarta.servlet.ServletException {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public Collection<jakarta.servlet.http.Part> getParts()
+                    throws IOException, jakarta.servlet.ServletException {
+                return HttpServletRequest.this.getParts();
+            }
+
+            @Override
+            public jakarta.servlet.http.Part getPart(String s) throws IOException, jakarta.servlet.ServletException {
+                return HttpServletRequest.this.getPart(s);
+            }
+
+            @Override
+            public <T extends jakarta.servlet.http.HttpUpgradeHandler> T upgrade(Class<T> aClass)
+                    throws IOException, jakarta.servlet.ServletException {
+                // TODO
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public Map<String, String> getTrailerFields() {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public boolean isTrailerFieldsReady() {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    static HttpServletRequest fromJakartaHttpServletRequest(jakarta.servlet.http.HttpServletRequest from) {
+        return new HttpServletRequest() {
+            @Override
+            public Object getAttribute(String name) {
+                return from.getAttribute(name);
+            }
+
+            @Override
+            public Enumeration<String> getAttributeNames() {
+                return from.getAttributeNames();
+            }
+
+            @Override
+            public String getCharacterEncoding() {
+                return from.getCharacterEncoding();
+            }
+
+            @Override
+            public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
+                from.setCharacterEncoding(env);
+            }
+
+            @Override
+            public int getContentLength() {
+                return from.getContentLength();
+            }
+
+            @Override
+            public long getContentLengthLong() {
+                return from.getContentLengthLong();
+            }
+
+            @Override
+            public String getContentType() {
+                return from.getContentType();
+            }
+
+            @Override
+            @WithBridgeMethods(value = ServletInputStream.class, adapterMethod = "fromJakartaServletInputStream")
+            public jakarta.servlet.ServletInputStream getInputStream() throws IOException {
+                return from.getInputStream();
+            }
+
+            private Object fromJakartaServletInputStream(
+                    jakarta.servlet.ServletInputStream inputStream, Class<?> type) {
+                return ServletInputStream.fromJakartaServletInputStream(inputStream);
+            }
+
+            @Override
+            public String getParameter(String name) {
+                return from.getParameter(name);
+            }
+
+            @Override
+            public Enumeration<String> getParameterNames() {
+                return from.getParameterNames();
+            }
+
+            @Override
+            public String[] getParameterValues(String name) {
+                return from.getParameterValues(name);
+            }
+
+            @Override
+            public Map<String, String[]> getParameterMap() {
+                return from.getParameterMap();
+            }
+
+            @Override
+            public String getProtocol() {
+                return from.getProtocol();
+            }
+
+            @Override
+            public String getScheme() {
+                return from.getScheme();
+            }
+
+            @Override
+            public String getServerName() {
+                return from.getServerName();
+            }
+
+            @Override
+            public int getServerPort() {
+                return from.getServerPort();
+            }
+
+            @Override
+            public BufferedReader getReader() throws IOException {
+                return from.getReader();
+            }
+
+            @Override
+            public String getRemoteAddr() {
+                return from.getRemoteAddr();
+            }
+
+            @Override
+            public String getRemoteHost() {
+                return from.getRemoteHost();
+            }
+
+            @Override
+            public void setAttribute(String name, Object o) {
+                from.setAttribute(name, o);
+            }
+
+            @Override
+            public void removeAttribute(String name) {
+                from.removeAttribute(name);
+            }
+
+            @Override
+            public Locale getLocale() {
+                return from.getLocale();
+            }
+
+            @Override
+            public Enumeration<Locale> getLocales() {
+                return from.getLocales();
+            }
+
+            @Override
+            public boolean isSecure() {
+                return from.isSecure();
+            }
+
+            @Override
+            @WithBridgeMethods(value = RequestDispatcher.class, adapterMethod = "fromJakartaRequestDispatcher")
+            public jakarta.servlet.RequestDispatcher getRequestDispatcher(String path) {
+                return from.getRequestDispatcher(path);
+            }
+
+            private Object fromJakartaRequestDispatcher(
+                    jakarta.servlet.RequestDispatcher requestDispatcher, Class<?> type) {
+                return RequestDispatcher.fromJakartaRequestDispatcher(requestDispatcher);
+            }
+
+            @Override
+            public String getRealPath(String path) {
+                return from.getRealPath(path);
+            }
+
+            @Override
+            public int getRemotePort() {
+                return from.getRemotePort();
+            }
+
+            @Override
+            public String getLocalName() {
+                return from.getLocalName();
+            }
+
+            @Override
+            public String getLocalAddr() {
+                return from.getLocalAddr();
+            }
+
+            @Override
+            public int getLocalPort() {
+                return from.getLocalPort();
+            }
+
+            @Override
+            @WithBridgeMethods(value = ServletContext.class, adapterMethod = "fromJakartaServletContext")
+            public jakarta.servlet.ServletContext getServletContext() {
+                return from.getServletContext();
+            }
+
+            private Object fromJakartaServletContext(jakarta.servlet.ServletContext servletContext, Class<?> type) {
+                return ServletContext.fromJakartServletContext(servletContext);
+            }
+
+            // @Override
+            // public AsyncContext startAsync() throws IllegalStateException {
+            //    throw new UnsupportedOperationException();
+            // }
+
+            // @Override
+            // public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
+            //        throws IllegalStateException {
+            //    throw new UnsupportedOperationException();
+            // }
+
+            // @Override
+            // public boolean isAsyncStarted() {
+            //    return from.isAsyncStarted();
+            // }
+
+            // @Override
+            // public boolean isAsyncSupported() {
+            //    return from.isAsyncSupported();
+            // }
+
+            // @Override
+            // public AsyncContext getAsyncContext() {
+            //    throw new UnsupportedOperationException();
+            // }
+
+            @Override
+            @WithBridgeMethods(value = DispatcherType.class, adapterMethod = "fromJakartaDispatcherType")
+            public jakarta.servlet.DispatcherType getDispatcherType() {
+                return from.getDispatcherType();
+            }
+
+            private Object fromJakartaDispatcherType(jakarta.servlet.DispatcherType dispatcherType, Class<?> type) {
+                return DispatcherType.fromJakartaDispatcherType(dispatcherType);
+            }
+
+            @Override
+            public String getAuthType() {
+                return from.getAuthType();
+            }
+
+            @Override
+            @WithBridgeMethods(value = Cookie[].class, adapterMethod = "fromJakartaCookies")
+            public jakarta.servlet.http.Cookie[] getCookies() {
+                return from.getCookies();
+            }
+
+            private Object fromJakartaCookies(jakarta.servlet.http.Cookie[] cookies, Class<?> type) {
+                return Stream.of(cookies)
+                        .map(Cookie::fromJakartaServletHttpCookie)
+                        .toArray(Cookie[]::new);
+            }
+
+            @Override
+            public long getDateHeader(String name) {
+                return from.getDateHeader(name);
+            }
+
+            @Override
+            public String getHeader(String name) {
+                return from.getHeader(name);
+            }
+
+            @Override
+            public Enumeration<String> getHeaders(String name) {
+                return from.getHeaders(name);
+            }
+
+            @Override
+            public Enumeration<String> getHeaderNames() {
+                return from.getHeaderNames();
+            }
+
+            @Override
+            public int getIntHeader(String name) {
+                return from.getIntHeader(name);
+            }
+
+            // @Override
+            // public jakarta.servlet.http.HttpServletMapping getHttpServletMapping() {
+            //    return from.getHttpServletMapping();
+            // }
+
+            @Override
+            public String getMethod() {
+                return from.getMethod();
+            }
+
+            @Override
+            public String getPathInfo() {
+                return from.getPathInfo();
+            }
+
+            @Override
+            public String getPathTranslated() {
+                return from.getPathTranslated();
+            }
+
+            // @Override
+            // public PushBuilder newPushBuilder() {
+            //    throw new UnsupportedOperationException();
+            // }
+
+            @Override
+            public String getContextPath() {
+                return from.getContextPath();
+            }
+
+            @Override
+            public String getQueryString() {
+                return from.getQueryString();
+            }
+
+            @Override
+            public String getRemoteUser() {
+                return from.getRemoteUser();
+            }
+
+            @Override
+            public boolean isUserInRole(String role) {
+                return from.isUserInRole(role);
+            }
+
+            @Override
+            public Principal getUserPrincipal() {
+                return from.getUserPrincipal();
+            }
+
+            @Override
+            public String getRequestedSessionId() {
+                return from.getRequestedSessionId();
+            }
+
+            @Override
+            public String getRequestURI() {
+                return from.getRequestURI();
+            }
+
+            @Override
+            public StringBuffer getRequestURL() {
+                return from.getRequestURL();
+            }
+
+            @Override
+            public String getServletPath() {
+                return from.getServletPath();
+            }
+
+            @Override
+            @WithBridgeMethods(value = HttpSession.class, adapterMethod = "fromJakartaHttpSession")
+            public jakarta.servlet.http.HttpSession getSession(boolean create) {
+                return from.getSession(create);
+            }
+
+            @Override
+            @WithBridgeMethods(value = HttpSession.class, adapterMethod = "fromJakartaHttpSession")
+            public jakarta.servlet.http.HttpSession getSession() {
+                return from.getSession();
+            }
+
+            private Object fromJakartaHttpSession(jakarta.servlet.http.HttpSession httpSession, Class<?> type) {
+                return HttpSession.fromJakartaHttpSession(httpSession);
+            }
+
+            @Override
+            public String changeSessionId() {
+                return from.changeSessionId();
+            }
+
+            @Override
+            public boolean isRequestedSessionIdValid() {
+                return from.isRequestedSessionIdValid();
+            }
+
+            @Override
+            public boolean isRequestedSessionIdFromCookie() {
+                return from.isRequestedSessionIdFromCookie();
+            }
+
+            @Override
+            public boolean isRequestedSessionIdFromURL() {
+                return from.isRequestedSessionIdFromURL();
+            }
+
+            @Override
+            public boolean isRequestedSessionIdFromUrl() {
+                return from.isRequestedSessionIdFromUrl();
+            }
+
+            @Override
+            public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
+                try {
+                    return from.authenticate(response.toJakartaHttpServletResponse());
+                } catch (jakarta.servlet.ServletException e) {
+                    throw new ServletException(e);
+                }
+            }
+
+            // @Override
+            // public void login(String username, String password) throws ServletException {
+            //    try {
+            //        from.login(username, password);
+            //    } catch (jakarta.servlet.ServletException e) {
+            //        throw new ServletException(e);
+            //    }
+            // }
+
+            // @Override
+            // public void logout() throws ServletException {
+            //    try {
+            //        from.logout();
+            //    } catch (jakarta.servlet.ServletException e) {
+            //        throw new ServletException(e);
+            //    }
+            // }
+
+            @Override
+            public Collection<jakarta.servlet.http.Part> getParts()
+                    throws IOException, jakarta.servlet.ServletException {
+                return from.getParts();
+            }
+
+            @Override
+            @WithBridgeMethods(value = Part.class, adapterMethod = "fromJakartaPart")
+            public jakarta.servlet.http.Part getPart(String name) throws IOException, jakarta.servlet.ServletException {
+                return from.getPart(name);
+            }
+
+            private Object fromJakartaPart(jakarta.servlet.http.Part part, Class<?> type) {
+                return Part.fromJakartaPart(part);
+            }
+
+            // @Override
+            // public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass)
+            //        throws IOException, ServletException {
+            //    throw new UnsupportedOperationException();
+            // }
+
+            // @Override
+            // public Map<String, String> getTrailerFields() {
+            //    return from.getTrailerFields();
+            // }
+
+            // @Override
+            // public boolean isTrailerFieldsReady() {
+            //    return from.isTrailerFieldsReady();
+            // }
+
+            @Override
+            public jakarta.servlet.ServletRequest toJakartaServletRequest() {
+                return from;
+            }
+
+            @Override
+            public jakarta.servlet.http.HttpServletRequest toJakartaHttpServletRequest() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/core/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
new file mode 100644
index 0000000000..7d946b8cac
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.stream.Stream;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequestWrapper;
+
+public class HttpServletRequestWrapper extends ServletRequestWrapper implements HttpServletRequest {
+    public HttpServletRequestWrapper(HttpServletRequest request) {
+        super(request);
+    }
+
+    private HttpServletRequest _getHttpServletRequest() {
+        return (HttpServletRequest) super.getRequest();
+    }
+
+    @Override
+    public String getAuthType() {
+        return this._getHttpServletRequest().getAuthType();
+    }
+
+    @Override
+    @WithBridgeMethods(value = Cookie[].class, adapterMethod = "fromJakartaCookies")
+    public jakarta.servlet.http.Cookie[] getCookies() {
+        return this._getHttpServletRequest().getCookies();
+    }
+
+    private Object fromJakartaCookies(jakarta.servlet.http.Cookie[] cookies, Class<?> type) {
+        return Stream.of(cookies).map(Cookie::fromJakartaServletHttpCookie).toArray(Cookie[]::new);
+    }
+
+    @Override
+    public long getDateHeader(String name) {
+        return this._getHttpServletRequest().getDateHeader(name);
+    }
+
+    @Override
+    public String getHeader(String name) {
+        return this._getHttpServletRequest().getHeader(name);
+    }
+
+    @Override
+    public Enumeration<String> getHeaders(String name) {
+        return this._getHttpServletRequest().getHeaders(name);
+    }
+
+    @Override
+    public Enumeration<String> getHeaderNames() {
+        return this._getHttpServletRequest().getHeaderNames();
+    }
+
+    @Override
+    public int getIntHeader(String name) {
+        return this._getHttpServletRequest().getIntHeader(name);
+    }
+
+    // @Override
+    // public jakarta.servlet.http.HttpServletMapping getHttpServletMapping() {
+    //    return this._getHttpServletRequest().getHttpServletMapping();
+    // }
+
+    // private Object fromJakartaHttpServletMapping(
+    //        jakarta.servlet.http.HttpServletMapping httpServletMapping, Class<?> type) {
+    //    return HttpServletMapping.fromJakartaHttpServletMapping(httpServletMapping);
+    // }
+
+    @Override
+    public String getMethod() {
+        return this._getHttpServletRequest().getMethod();
+    }
+
+    @Override
+    public String getPathInfo() {
+        return this._getHttpServletRequest().getPathInfo();
+    }
+
+    @Override
+    public String getPathTranslated() {
+        return this._getHttpServletRequest().getPathTranslated();
+    }
+
+    @Override
+    public String getContextPath() {
+        return this._getHttpServletRequest().getContextPath();
+    }
+
+    @Override
+    public String getQueryString() {
+        return this._getHttpServletRequest().getQueryString();
+    }
+
+    @Override
+    public String getRemoteUser() {
+        return this._getHttpServletRequest().getRemoteUser();
+    }
+
+    @Override
+    public boolean isUserInRole(String role) {
+        return this._getHttpServletRequest().isUserInRole(role);
+    }
+
+    @Override
+    public java.security.Principal getUserPrincipal() {
+        return this._getHttpServletRequest().getUserPrincipal();
+    }
+
+    @Override
+    public String getRequestedSessionId() {
+        return this._getHttpServletRequest().getRequestedSessionId();
+    }
+
+    @Override
+    public String getRequestURI() {
+        return this._getHttpServletRequest().getRequestURI();
+    }
+
+    @Override
+    public StringBuffer getRequestURL() {
+        return this._getHttpServletRequest().getRequestURL();
+    }
+
+    @Override
+    public String getServletPath() {
+        return this._getHttpServletRequest().getServletPath();
+    }
+
+    @Override
+    @WithBridgeMethods(value = HttpSession.class, adapterMethod = "fromJakartaHttpSession")
+    public jakarta.servlet.http.HttpSession getSession(boolean create) {
+        return this._getHttpServletRequest().getSession(create);
+    }
+
+    @Override
+    @WithBridgeMethods(value = HttpSession.class, adapterMethod = "fromJakartaHttpSession")
+    public jakarta.servlet.http.HttpSession getSession() {
+        return this._getHttpServletRequest().getSession();
+    }
+
+    private Object fromJakartaHttpSession(jakarta.servlet.http.HttpSession httpSession, Class<?> type) {
+        return HttpSession.fromJakartaHttpSession(httpSession);
+    }
+
+    @Override
+    public String changeSessionId() {
+        return this._getHttpServletRequest().changeSessionId();
+    }
+
+    @Override
+    public boolean isRequestedSessionIdValid() {
+        return this._getHttpServletRequest().isRequestedSessionIdValid();
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromCookie() {
+        return this._getHttpServletRequest().isRequestedSessionIdFromCookie();
+    }
+
+    @Override
+    public boolean isRequestedSessionIdFromURL() {
+        return this._getHttpServletRequest().isRequestedSessionIdFromURL();
+    }
+
+    @Deprecated
+    @Override
+    public boolean isRequestedSessionIdFromUrl() {
+        return this._getHttpServletRequest().isRequestedSessionIdFromUrl();
+    }
+
+    @Override
+    public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
+        return this._getHttpServletRequest().authenticate(response);
+    }
+
+    // @Override
+    // public void login(String username, String password) throws ServletException {
+    //    this._getHttpServletRequest().login(username, password);
+    // }
+
+    // @Override
+    // public void logout() throws ServletException {
+    //    this._getHttpServletRequest().logout();
+    // }
+
+    @Override
+    public Collection<jakarta.servlet.http.Part> getParts() throws IOException, jakarta.servlet.ServletException {
+        return this._getHttpServletRequest().getParts();
+    }
+
+    @Override
+    @WithBridgeMethods(value = Part.class, adapterMethod = "fromJakartaPart")
+    public jakarta.servlet.http.Part getPart(String name) throws IOException, jakarta.servlet.ServletException {
+        return this._getHttpServletRequest().getPart(name);
+    }
+
+    private Object fromJakartaPart(jakarta.servlet.http.Part part, Class<?> type) {
+        return Part.fromJakartaPart(part);
+    }
+
+    // @Override
+    // public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
+    //    return this._getHttpServletRequest().upgrade(handlerClass);
+    // }
+
+    // @Override
+    // public PushBuilder newPushBuilder() {
+    //    return this._getHttpServletRequest().newPushBuilder();
+    // }
+
+    // @Override
+    // public Map<String, String> getTrailerFields() {
+    //    return this._getHttpServletRequest().getTrailerFields();
+    // }
+
+    // @Override
+    // public boolean isTrailerFieldsReady() {
+    //    return this._getHttpServletRequest().isTrailerFieldsReady();
+    // }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpServletResponse.java b/core/src/main/java/javax/servlet/http/HttpServletResponse.java
new file mode 100644
index 0000000000..2f4b91da74
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpServletResponse.java
@@ -0,0 +1,582 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Collection;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Supplier;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletResponse;
+
+@SuppressFBWarnings(
+        value = {"UNVALIDATED_REDIRECT", "URL_REWRITING", "XSS_SERVLET"},
+        justification = "TODO needs triage")
+public interface HttpServletResponse extends ServletResponse {
+    void addCookie(Cookie cookie);
+
+    boolean containsHeader(String name);
+
+    String encodeURL(String url);
+
+    String encodeRedirectURL(String url);
+
+    @Deprecated
+    String encodeUrl(String url);
+
+    @Deprecated
+    String encodeRedirectUrl(String url);
+
+    void sendError(int sc, String msg) throws IOException;
+
+    void sendError(int sc) throws IOException;
+
+    void sendRedirect(String location) throws IOException;
+
+    void setDateHeader(String name, long date);
+
+    void addDateHeader(String name, long date);
+
+    void setHeader(String name, String value);
+
+    void addHeader(String name, String value);
+
+    void setIntHeader(String name, int value);
+
+    void addIntHeader(String name, int value);
+
+    void setStatus(int sc);
+
+    @Deprecated
+    void setStatus(int sc, String sm);
+
+    int getStatus();
+
+    String getHeader(String name);
+
+    Collection<String> getHeaders(String name);
+
+    Collection<String> getHeaderNames();
+
+    // default void setTrailerFields(Supplier<Map<String, String>> supplier) {}
+
+    // default Supplier<Map<String, String>> getTrailerFields() {
+    //    return null;
+    // }
+
+    int SC_CONTINUE = 100;
+
+    int SC_SWITCHING_PROTOCOLS = 101;
+
+    int SC_OK = 200;
+
+    int SC_CREATED = 201;
+
+    int SC_ACCEPTED = 202;
+
+    int SC_NON_AUTHORITATIVE_INFORMATION = 203;
+
+    int SC_NO_CONTENT = 204;
+
+    int SC_RESET_CONTENT = 205;
+
+    int SC_PARTIAL_CONTENT = 206;
+
+    int SC_MULTIPLE_CHOICES = 300;
+
+    int SC_MOVED_PERMANENTLY = 301;
+
+    int SC_MOVED_TEMPORARILY = 302;
+
+    int SC_FOUND = 302;
+
+    int SC_SEE_OTHER = 303;
+
+    int SC_NOT_MODIFIED = 304;
+
+    int SC_USE_PROXY = 305;
+
+    int SC_TEMPORARY_REDIRECT = 307;
+
+    int SC_BAD_REQUEST = 400;
+
+    int SC_UNAUTHORIZED = 401;
+
+    int SC_PAYMENT_REQUIRED = 402;
+
+    int SC_FORBIDDEN = 403;
+
+    int SC_NOT_FOUND = 404;
+
+    int SC_METHOD_NOT_ALLOWED = 405;
+
+    int SC_NOT_ACCEPTABLE = 406;
+
+    int SC_PROXY_AUTHENTICATION_REQUIRED = 407;
+
+    int SC_REQUEST_TIMEOUT = 408;
+
+    int SC_CONFLICT = 409;
+
+    int SC_GONE = 410;
+
+    int SC_LENGTH_REQUIRED = 411;
+
+    int SC_PRECONDITION_FAILED = 412;
+
+    int SC_REQUEST_ENTITY_TOO_LARGE = 413;
+
+    int SC_REQUEST_URI_TOO_LONG = 414;
+
+    int SC_UNSUPPORTED_MEDIA_TYPE = 415;
+
+    int SC_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
+
+    int SC_EXPECTATION_FAILED = 417;
+
+    int SC_INTERNAL_SERVER_ERROR = 500;
+
+    int SC_NOT_IMPLEMENTED = 501;
+
+    int SC_BAD_GATEWAY = 502;
+
+    int SC_SERVICE_UNAVAILABLE = 503;
+
+    int SC_GATEWAY_TIMEOUT = 504;
+
+    int SC_HTTP_VERSION_NOT_SUPPORTED = 505;
+
+    default jakarta.servlet.http.HttpServletResponse toJakartaHttpServletResponse() {
+        return new jakarta.servlet.http.HttpServletResponse() {
+            @Override
+            public String getCharacterEncoding() {
+                return HttpServletResponse.this.getCharacterEncoding();
+            }
+
+            @Override
+            public String getContentType() {
+                return HttpServletResponse.this.getContentType();
+            }
+
+            @Override
+            public jakarta.servlet.ServletOutputStream getOutputStream() throws IOException {
+                return HttpServletResponse.this.getOutputStream();
+            }
+
+            @Override
+            public PrintWriter getWriter() throws IOException {
+                return HttpServletResponse.this.getWriter();
+            }
+
+            @Override
+            public void setCharacterEncoding(String s) {
+                HttpServletResponse.this.setCharacterEncoding(s);
+            }
+
+            @Override
+            public void setContentLength(int i) {
+                HttpServletResponse.this.setContentLength(i);
+            }
+
+            @Override
+            public void setContentLengthLong(long l) {
+                HttpServletResponse.this.setContentLengthLong(l);
+            }
+
+            @Override
+            public void setContentType(String s) {
+                HttpServletResponse.this.setContentType(s);
+            }
+
+            @Override
+            public void setBufferSize(int i) {
+                HttpServletResponse.this.setBufferSize(i);
+            }
+
+            @Override
+            public int getBufferSize() {
+                return HttpServletResponse.this.getBufferSize();
+            }
+
+            @Override
+            public void flushBuffer() throws IOException {
+                HttpServletResponse.this.flushBuffer();
+            }
+
+            @Override
+            public void resetBuffer() {
+                HttpServletResponse.this.resetBuffer();
+            }
+
+            @Override
+            public boolean isCommitted() {
+                return HttpServletResponse.this.isCommitted();
+            }
+
+            @Override
+            public void reset() {
+                HttpServletResponse.this.reset();
+            }
+
+            @Override
+            public void setLocale(Locale locale) {
+                HttpServletResponse.this.setLocale(locale);
+            }
+
+            @Override
+            public Locale getLocale() {
+                return HttpServletResponse.this.getLocale();
+            }
+
+            @Override
+            public void addCookie(jakarta.servlet.http.Cookie cookie) {
+                HttpServletResponse.this.addCookie(Cookie.fromJakartaServletHttpCookie(cookie));
+            }
+
+            @Override
+            public boolean containsHeader(String s) {
+                return HttpServletResponse.this.containsHeader(s);
+            }
+
+            @Override
+            public String encodeURL(String s) {
+                return HttpServletResponse.this.encodeURL(s);
+            }
+
+            @Override
+            public String encodeRedirectURL(String s) {
+                return HttpServletResponse.this.encodeRedirectURL(s);
+            }
+
+            @Override
+            public String encodeUrl(String s) {
+                return HttpServletResponse.this.encodeUrl(s);
+            }
+
+            @Override
+            public String encodeRedirectUrl(String s) {
+                return HttpServletResponse.this.encodeRedirectUrl(s);
+            }
+
+            @Override
+            public void sendError(int i, String s) throws IOException {
+                HttpServletResponse.this.sendError(i, s);
+            }
+
+            @Override
+            public void sendError(int i) throws IOException {
+                HttpServletResponse.this.sendError(i);
+            }
+
+            @Override
+            public void sendRedirect(String s) throws IOException {
+                HttpServletResponse.this.sendRedirect(s);
+            }
+
+            @Override
+            public void setDateHeader(String s, long l) {
+                HttpServletResponse.this.setDateHeader(s, l);
+            }
+
+            @Override
+            public void addDateHeader(String s, long l) {
+                HttpServletResponse.this.addDateHeader(s, l);
+            }
+
+            @Override
+            public void setHeader(String s, String s1) {
+                HttpServletResponse.this.setHeader(s, s1);
+            }
+
+            @Override
+            public void addHeader(String s, String s1) {
+                HttpServletResponse.this.addHeader(s, s1);
+            }
+
+            @Override
+            public void setIntHeader(String s, int i) {
+                HttpServletResponse.this.setIntHeader(s, i);
+            }
+
+            @Override
+            public void addIntHeader(String s, int i) {
+                HttpServletResponse.this.addIntHeader(s, i);
+            }
+
+            @Override
+            public void setStatus(int i) {
+                HttpServletResponse.this.setStatus(i);
+            }
+
+            @Override
+            public void setStatus(int i, String s) {
+                HttpServletResponse.this.setStatus(i, s);
+            }
+
+            @Override
+            public int getStatus() {
+                return HttpServletResponse.this.getStatus();
+            }
+
+            @Override
+            public String getHeader(String s) {
+                return HttpServletResponse.this.getHeader(s);
+            }
+
+            @Override
+            public Collection<String> getHeaders(String s) {
+                return HttpServletResponse.this.getHeaders(s);
+            }
+
+            @Override
+            public Collection<String> getHeaderNames() {
+                return HttpServletResponse.this.getHeaderNames();
+            }
+
+            @Override
+            public void setTrailerFields(Supplier<Map<String, String>> supplier) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public Supplier<Map<String, String>> getTrailerFields() {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    static HttpServletResponse fromJakartaHttpServletResponse(jakarta.servlet.http.HttpServletResponse from) {
+        return new HttpServletResponse() {
+            @Override
+            public String getCharacterEncoding() {
+                return from.getCharacterEncoding();
+            }
+
+            @Override
+            public String getContentType() {
+                return from.getContentType();
+            }
+
+            @Override
+            @WithBridgeMethods(value = ServletOutputStream.class, adapterMethod = "fromJakartaServletOutputStream")
+            public jakarta.servlet.ServletOutputStream getOutputStream() throws IOException {
+                return from.getOutputStream();
+            }
+
+            private Object fromJakartaServletOutputStream(
+                    jakarta.servlet.ServletOutputStream outputStream, Class<?> type) {
+                return ServletOutputStream.fromJakartaServletOutputStream(outputStream);
+            }
+
+            @Override
+            public PrintWriter getWriter() throws IOException {
+                return from.getWriter();
+            }
+
+            @Override
+            public void setCharacterEncoding(String charset) {
+                from.setCharacterEncoding(charset);
+            }
+
+            @Override
+            public void setContentLength(int len) {
+                from.setContentLength(len);
+            }
+
+            @Override
+            public void setContentLengthLong(long len) {
+                from.setContentLengthLong(len);
+            }
+
+            @Override
+            public void setContentType(String type) {
+                from.setContentType(type);
+            }
+
+            @Override
+            public void setBufferSize(int size) {
+                from.setBufferSize(size);
+            }
+
+            @Override
+            public int getBufferSize() {
+                return from.getBufferSize();
+            }
+
+            @Override
+            public void flushBuffer() throws IOException {
+                from.flushBuffer();
+            }
+
+            @Override
+            public void resetBuffer() {
+                from.resetBuffer();
+            }
+
+            @Override
+            public boolean isCommitted() {
+                return from.isCommitted();
+            }
+
+            @Override
+            public void reset() {
+                from.reset();
+            }
+
+            @Override
+            public void setLocale(Locale loc) {
+                from.setLocale(loc);
+            }
+
+            @Override
+            public Locale getLocale() {
+                return from.getLocale();
+            }
+
+            @Override
+            public void addCookie(Cookie cookie) {
+                from.addCookie(Cookie.toJakartaServletHttpCookie(cookie));
+            }
+
+            @Override
+            public boolean containsHeader(String name) {
+                return from.containsHeader(name);
+            }
+
+            @Override
+            public String encodeURL(String url) {
+                return from.encodeURL(url);
+            }
+
+            @Override
+            public String encodeRedirectURL(String url) {
+                return from.encodeRedirectURL(url);
+            }
+
+            @Override
+            public String encodeUrl(String url) {
+                return from.encodeUrl(url);
+            }
+
+            @Override
+            public String encodeRedirectUrl(String url) {
+                return from.encodeRedirectUrl(url);
+            }
+
+            @Override
+            public void sendError(int sc, String msg) throws IOException {
+                from.sendError(sc, msg);
+            }
+
+            @Override
+            public void sendError(int sc) throws IOException {
+                from.sendError(sc);
+            }
+
+            @Override
+            public void sendRedirect(String location) throws IOException {
+                from.sendRedirect(location);
+            }
+
+            @Override
+            public void setDateHeader(String name, long date) {
+                from.setDateHeader(name, date);
+            }
+
+            @Override
+            public void addDateHeader(String name, long date) {
+                from.addDateHeader(name, date);
+            }
+
+            @Override
+            public void setHeader(String name, String value) {
+                from.setHeader(name, value);
+            }
+
+            @Override
+            public void addHeader(String name, String value) {
+                from.addHeader(name, value);
+            }
+
+            @Override
+            public void setIntHeader(String name, int value) {
+                from.setIntHeader(name, value);
+            }
+
+            @Override
+            public void addIntHeader(String name, int value) {
+                from.addIntHeader(name, value);
+            }
+
+            @Override
+            public void setStatus(int sc) {
+                from.setStatus(sc);
+            }
+
+            @Override
+            public void setStatus(int sc, String sm) {
+                from.setStatus(sc, sm);
+            }
+
+            @Override
+            public int getStatus() {
+                return from.getStatus();
+            }
+
+            @Override
+            public String getHeader(String name) {
+                return from.getHeader(name);
+            }
+
+            @Override
+            public Collection<String> getHeaders(String name) {
+                return from.getHeaders(name);
+            }
+
+            @Override
+            public Collection<String> getHeaderNames() {
+                return from.getHeaderNames();
+            }
+
+            // @Override
+            // public void setTrailerFields(Supplier<Map<String, String>> supplier) {
+            //    from.setTrailerFields(supplier);
+            // }
+
+            // @Override
+            // public Supplier<Map<String, String>> getTrailerFields() {
+            //    return from.getTrailerFields();
+            // }
+
+            @Override
+            public jakarta.servlet.ServletResponse toJakartaServletResponse() {
+                return from;
+            }
+
+            @Override
+            public jakarta.servlet.http.HttpServletResponse toJakartaHttpServletResponse() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/core/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
new file mode 100644
index 0000000000..37e474928a
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.io.IOException;
+import java.util.Collection;
+import javax.servlet.ServletResponseWrapper;
+
+@SuppressFBWarnings(
+        value = {"UNVALIDATED_REDIRECT", "URL_REWRITING", "XSS_SERVLET"},
+        justification = "TODO needs triage")
+public class HttpServletResponseWrapper extends ServletResponseWrapper implements HttpServletResponse {
+    public HttpServletResponseWrapper(HttpServletResponse response) {
+        super(response);
+    }
+
+    private HttpServletResponse _getHttpServletResponse() {
+        return (HttpServletResponse) super.getResponse();
+    }
+
+    @Override
+    public void addCookie(Cookie cookie) {
+        this._getHttpServletResponse().addCookie(cookie);
+    }
+
+    @Override
+    public boolean containsHeader(String name) {
+        return this._getHttpServletResponse().containsHeader(name);
+    }
+
+    @Override
+    public String encodeURL(String url) {
+        return this._getHttpServletResponse().encodeURL(url);
+    }
+
+    @Override
+    public String encodeRedirectURL(String url) {
+        return this._getHttpServletResponse().encodeRedirectURL(url);
+    }
+
+    @Deprecated
+    @Override
+    public String encodeUrl(String url) {
+        return this._getHttpServletResponse().encodeUrl(url);
+    }
+
+    @Deprecated
+    @Override
+    public String encodeRedirectUrl(String url) {
+        return this._getHttpServletResponse().encodeRedirectUrl(url);
+    }
+
+    @Override
+    public void sendError(int sc, String msg) throws IOException {
+        this._getHttpServletResponse().sendError(sc, msg);
+    }
+
+    @Override
+    public void sendError(int sc) throws IOException {
+        this._getHttpServletResponse().sendError(sc);
+    }
+
+    @Override
+    public void sendRedirect(String location) throws IOException {
+        this._getHttpServletResponse().sendRedirect(location);
+    }
+
+    @Override
+    public void setDateHeader(String name, long date) {
+        this._getHttpServletResponse().setDateHeader(name, date);
+    }
+
+    @Override
+    public void addDateHeader(String name, long date) {
+        this._getHttpServletResponse().addDateHeader(name, date);
+    }
+
+    @Override
+    public void setHeader(String name, String value) {
+        this._getHttpServletResponse().setHeader(name, value);
+    }
+
+    @Override
+    public void addHeader(String name, String value) {
+        this._getHttpServletResponse().addHeader(name, value);
+    }
+
+    @Override
+    public void setIntHeader(String name, int value) {
+        this._getHttpServletResponse().setIntHeader(name, value);
+    }
+
+    @Override
+    public void addIntHeader(String name, int value) {
+        this._getHttpServletResponse().addIntHeader(name, value);
+    }
+
+    @Override
+    public void setStatus(int sc) {
+        this._getHttpServletResponse().setStatus(sc);
+    }
+
+    @Deprecated
+    @Override
+    public void setStatus(int sc, String sm) {
+        this._getHttpServletResponse().setStatus(sc, sm);
+    }
+
+    @Override
+    public int getStatus() {
+        return _getHttpServletResponse().getStatus();
+    }
+
+    @Override
+    public String getHeader(String name) {
+        return _getHttpServletResponse().getHeader(name);
+    }
+
+    @Override
+    public Collection<String> getHeaders(String name) {
+        return _getHttpServletResponse().getHeaders(name);
+    }
+
+    @Override
+    public Collection<String> getHeaderNames() {
+        return _getHttpServletResponse().getHeaderNames();
+    }
+
+    // @Override
+    // public void setTrailerFields(Supplier<Map<String, String>> supplier) {
+    //    _getHttpServletResponse().setTrailerFields(supplier);
+    // }
+
+    // @Override
+    // public Supplier<Map<String, String>> getTrailerFields() {
+    //    return _getHttpServletResponse().getTrailerFields();
+    // }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpSession.java b/core/src/main/java/javax/servlet/http/HttpSession.java
new file mode 100644
index 0000000000..17a295380a
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpSession.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import java.util.Enumeration;
+import javax.servlet.ServletContext;
+
+public interface HttpSession {
+    long getCreationTime();
+
+    String getId();
+
+    long getLastAccessedTime();
+
+    ServletContext getServletContext();
+
+    void setMaxInactiveInterval(int interval);
+
+    int getMaxInactiveInterval();
+
+    @Deprecated
+    HttpSessionContext getSessionContext();
+
+    Object getAttribute(String name);
+
+    @Deprecated
+    Object getValue(String name);
+
+    Enumeration<String> getAttributeNames();
+
+    @Deprecated
+    String[] getValueNames();
+
+    void setAttribute(String name, Object value);
+
+    @Deprecated
+    void putValue(String name, Object value);
+
+    void removeAttribute(String name);
+
+    @Deprecated
+    void removeValue(String name);
+
+    void invalidate();
+
+    boolean isNew();
+
+    default jakarta.servlet.http.HttpSession toJakartaHttpSession() {
+        return new jakarta.servlet.http.HttpSession() {
+            @Override
+            public long getCreationTime() {
+                return HttpSession.this.getCreationTime();
+            }
+
+            @Override
+            public String getId() {
+                return HttpSession.this.getId();
+            }
+
+            @Override
+            public long getLastAccessedTime() {
+                return HttpSession.this.getLastAccessedTime();
+            }
+
+            @Override
+            public jakarta.servlet.ServletContext getServletContext() {
+                return HttpSession.this.getServletContext().toJakartaServletContext();
+            }
+
+            @Override
+            public void setMaxInactiveInterval(int interval) {
+                HttpSession.this.setMaxInactiveInterval(interval);
+            }
+
+            @Override
+            public int getMaxInactiveInterval() {
+                return HttpSession.this.getMaxInactiveInterval();
+            }
+
+            @Override
+            public jakarta.servlet.http.HttpSessionContext getSessionContext() {
+                return HttpSession.this.getSessionContext().toJakartaHttpSessionContext();
+            }
+
+            @Override
+            public Object getAttribute(String name) {
+                return HttpSession.this.getAttribute(name);
+            }
+
+            @Override
+            public Object getValue(String name) {
+                return HttpSession.this.getValue(name);
+            }
+
+            @Override
+            public Enumeration<String> getAttributeNames() {
+                return HttpSession.this.getAttributeNames();
+            }
+
+            @Override
+            public String[] getValueNames() {
+                return HttpSession.this.getValueNames();
+            }
+
+            @Override
+            public void setAttribute(String name, Object value) {
+                HttpSession.this.setAttribute(name, value);
+            }
+
+            @Override
+            public void putValue(String name, Object value) {
+                HttpSession.this.putValue(name, value);
+            }
+
+            @Override
+            public void removeAttribute(String name) {
+                HttpSession.this.removeAttribute(name);
+            }
+
+            @Override
+            public void removeValue(String name) {
+                HttpSession.this.removeValue(name);
+            }
+
+            @Override
+            public void invalidate() {
+                HttpSession.this.invalidate();
+            }
+
+            @Override
+            public boolean isNew() {
+                return HttpSession.this.isNew();
+            }
+        };
+    }
+
+    static HttpSession fromJakartaHttpSession(jakarta.servlet.http.HttpSession from) {
+        return new HttpSession() {
+            @Override
+            public long getCreationTime() {
+                return from.getCreationTime();
+            }
+
+            @Override
+            public String getId() {
+                return from.getId();
+            }
+
+            @Override
+            public long getLastAccessedTime() {
+                return from.getLastAccessedTime();
+            }
+
+            @Override
+            public ServletContext getServletContext() {
+                return ServletContext.fromJakartServletContext(from.getServletContext());
+            }
+
+            @Override
+            public void setMaxInactiveInterval(int interval) {
+                from.setMaxInactiveInterval(interval);
+            }
+
+            @Override
+            public int getMaxInactiveInterval() {
+                return from.getMaxInactiveInterval();
+            }
+
+            @Override
+            public HttpSessionContext getSessionContext() {
+                return HttpSessionContext.fromJakartaHttpSessionContext(from.getSessionContext());
+            }
+
+            @Override
+            public Object getAttribute(String name) {
+                return from.getAttribute(name);
+            }
+
+            @Override
+            public Object getValue(String name) {
+                return from.getValue(name);
+            }
+
+            @Override
+            public Enumeration<String> getAttributeNames() {
+                return from.getAttributeNames();
+            }
+
+            @Override
+            public String[] getValueNames() {
+                return from.getValueNames();
+            }
+
+            @Override
+            public void setAttribute(String name, Object value) {
+                from.setAttribute(name, value);
+            }
+
+            @Override
+            public void putValue(String name, Object value) {
+                from.putValue(name, value);
+            }
+
+            @Override
+            public void removeAttribute(String name) {
+                from.removeAttribute(name);
+            }
+
+            @Override
+            public void removeValue(String name) {
+                from.removeValue(name);
+            }
+
+            @Override
+            public void invalidate() {
+                from.invalidate();
+            }
+
+            @Override
+            public boolean isNew() {
+                return from.isNew();
+            }
+
+            @Override
+            public jakarta.servlet.http.HttpSession toJakartaHttpSession() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpSessionActivationListener.java b/core/src/main/java/javax/servlet/http/HttpSessionActivationListener.java
new file mode 100644
index 0000000000..d52473511e
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpSessionActivationListener.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import java.util.EventListener;
+
+public interface HttpSessionActivationListener extends EventListener {
+    default void sessionWillPassivate(HttpSessionEvent se) {}
+
+    default void sessionDidActivate(HttpSessionEvent se) {}
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java b/core/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java
new file mode 100644
index 0000000000..44903ced26
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import java.util.EventListener;
+
+public interface HttpSessionAttributeListener extends EventListener {
+    default void attributeAdded(HttpSessionBindingEvent event) {}
+
+    default void attributeRemoved(HttpSessionBindingEvent event) {}
+
+    default void attributeReplaced(HttpSessionBindingEvent event) {}
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java b/core/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java
new file mode 100644
index 0000000000..f578d91ca1
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+public class HttpSessionBindingEvent extends HttpSessionEvent {
+    private static final long serialVersionUID = 7308000419984825907L;
+
+    private String name;
+
+    private Object value;
+
+    public HttpSessionBindingEvent(HttpSession session, String name) {
+        super(session);
+        this.name = name;
+    }
+
+    public HttpSessionBindingEvent(HttpSession session, String name, Object value) {
+        super(session);
+        this.name = name;
+        this.value = value;
+    }
+
+    @Override
+    public HttpSession getSession() {
+        return super.getSession();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Object getValue() {
+        return this.value;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpSessionBindingListener.java b/core/src/main/java/javax/servlet/http/HttpSessionBindingListener.java
new file mode 100644
index 0000000000..226d9933e2
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpSessionBindingListener.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import java.util.EventListener;
+
+public interface HttpSessionBindingListener extends EventListener {
+    default void valueBound(HttpSessionBindingEvent event) {}
+
+    default void valueUnbound(HttpSessionBindingEvent event) {}
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpSessionContext.java b/core/src/main/java/javax/servlet/http/HttpSessionContext.java
new file mode 100644
index 0000000000..0f36ac65a7
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpSessionContext.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import java.util.Enumeration;
+
+@Deprecated
+public interface HttpSessionContext {
+    @Deprecated
+    HttpSession getSession(String sessionId);
+
+    @Deprecated
+    Enumeration<String> getIds();
+
+    default jakarta.servlet.http.HttpSessionContext toJakartaHttpSessionContext() {
+        return new jakarta.servlet.http.HttpSessionContext() {
+            @Override
+            public jakarta.servlet.http.HttpSession getSession(String sessionId) {
+                return HttpSessionContext.this.getSession(sessionId).toJakartaHttpSession();
+            }
+
+            @Override
+            public Enumeration<String> getIds() {
+                return HttpSessionContext.this.getIds();
+            }
+        };
+    }
+
+    static HttpSessionContext fromJakartaHttpSessionContext(jakarta.servlet.http.HttpSessionContext from) {
+        return new HttpSessionContext() {
+            @Override
+            public HttpSession getSession(String sessionId) {
+                return HttpSession.fromJakartaHttpSession(from.getSession(sessionId));
+            }
+
+            @Override
+            public Enumeration<String> getIds() {
+                return from.getIds();
+            }
+
+            @Override
+            public jakarta.servlet.http.HttpSessionContext toJakartaHttpSessionContext() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpSessionEvent.java b/core/src/main/java/javax/servlet/http/HttpSessionEvent.java
new file mode 100644
index 0000000000..a917b32be2
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpSessionEvent.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+public class HttpSessionEvent extends java.util.EventObject {
+    private static final long serialVersionUID = -7622791603672342895L;
+
+    public HttpSessionEvent(HttpSession source) {
+        super(source);
+    }
+
+    public HttpSession getSession() {
+        return (HttpSession) super.getSource();
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpSessionIdListener.java b/core/src/main/java/javax/servlet/http/HttpSessionIdListener.java
new file mode 100644
index 0000000000..701996fc83
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpSessionIdListener.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.http;
+
+import java.util.EventListener;
+
+public interface HttpSessionIdListener extends EventListener {
+    void sessionIdChanged(HttpSessionEvent event, String oldSessionId);
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpSessionListener.java b/core/src/main/java/javax/servlet/http/HttpSessionListener.java
new file mode 100644
index 0000000000..8feebea7df
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpSessionListener.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import java.util.EventListener;
+
+public interface HttpSessionListener extends EventListener {
+    default void sessionCreated(HttpSessionEvent se) {}
+
+    default void sessionDestroyed(HttpSessionEvent se) {}
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpUpgradeHandler.java b/core/src/main/java/javax/servlet/http/HttpUpgradeHandler.java
new file mode 100644
index 0000000000..6c27dc070b
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpUpgradeHandler.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.http;
+
+public interface HttpUpgradeHandler {
+    void init(WebConnection wc);
+
+    void destroy();
+}
diff --git a/core/src/main/java/javax/servlet/http/HttpUtils.java b/core/src/main/java/javax/servlet/http/HttpUtils.java
new file mode 100644
index 0000000000..c6d672f089
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/HttpUtils.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.servlet.http;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Hashtable;
+import java.util.ResourceBundle;
+import java.util.StringTokenizer;
+import javax.servlet.ServletInputStream;
+
+@Deprecated
+public class HttpUtils {
+    private static final String LSTRING_FILE = "javax.servlet.http.LocalStrings";
+    private static ResourceBundle lStrings = ResourceBundle.getBundle(LSTRING_FILE);
+
+    public HttpUtils() {}
+
+    public static Hashtable<String, String[]> parseQueryString(String s) {
+        String[] valArray = null;
+
+        if (s == null) {
+            throw new IllegalArgumentException();
+        }
+
+        Hashtable<String, String[]> ht = new Hashtable<>();
+        StringBuilder sb = new StringBuilder();
+        StringTokenizer st = new StringTokenizer(s, "&");
+        while (st.hasMoreTokens()) {
+            String pair = st.nextToken();
+            int pos = pair.indexOf('=');
+            if (pos == -1) {
+                throw new IllegalArgumentException();
+            }
+            String key = parseName(pair.substring(0, pos), sb);
+            String val = parseName(pair.substring(pos + 1, pair.length()), sb);
+            if (ht.containsKey(key)) {
+                String[] oldVals = ht.get(key);
+                valArray = new String[oldVals.length + 1];
+                for (int i = 0; i < oldVals.length; i++) {
+                    valArray[i] = oldVals[i];
+                }
+                valArray[oldVals.length] = val;
+            } else {
+                valArray = new String[1];
+                valArray[0] = val;
+            }
+            ht.put(key, valArray);
+        }
+
+        return ht;
+    }
+
+    public static Hashtable<String, String[]> parsePostData(int len, ServletInputStream in) {
+        if (len <= 0) {
+            return new Hashtable<>();
+        }
+
+        if (in == null) {
+            throw new IllegalArgumentException();
+        }
+
+        byte[] postedBytes = new byte[len];
+        try {
+            int offset = 0;
+
+            do {
+                int inputLen = in.read(postedBytes, offset, len - offset);
+                if (inputLen <= 0) {
+                    String msg = lStrings.getString("err.io.short_read");
+                    throw new IllegalArgumentException(msg);
+                }
+                offset += inputLen;
+            } while ((len - offset) > 0);
+
+        } catch (IOException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        }
+
+        String postedBody = new String(postedBytes, 0, len, StandardCharsets.ISO_8859_1);
+        return parseQueryString(postedBody);
+    }
+
+    private static String parseName(String s, StringBuilder sb) {
+        sb.setLength(0);
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            switch (c) {
+                case '+':
+                    sb.append(' ');
+                    break;
+                case '%':
+                    try {
+                        sb.append((char) Integer.parseInt(s.substring(i + 1, i + 3), 16));
+                        i += 2;
+                    } catch (NumberFormatException e) {
+                        throw new IllegalArgumentException();
+                    } catch (StringIndexOutOfBoundsException e) {
+                        String rest = s.substring(i);
+                        sb.append(rest);
+                        if (rest.length() == 2) i++;
+                    }
+
+                    break;
+                default:
+                    sb.append(c);
+                    break;
+            }
+        }
+
+        return sb.toString();
+    }
+
+    public static StringBuffer getRequestURL(HttpServletRequest req) {
+        StringBuffer url = new StringBuffer();
+        String scheme = req.getScheme();
+        int port = req.getServerPort();
+        String urlPath = req.getRequestURI();
+
+        url.append(scheme);
+        url.append("://");
+        url.append(req.getServerName());
+        if ((scheme.equals("http") && port != 80) || (scheme.equals("https") && port != 443)) {
+            url.append(':');
+            url.append(req.getServerPort());
+        }
+        url.append(urlPath);
+
+        return url;
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/MappingMatch.java b/core/src/main/java/javax/servlet/http/MappingMatch.java
new file mode 100644
index 0000000000..53db1ffc8c
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/MappingMatch.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.http;
+
+public enum MappingMatch {
+    CONTEXT_ROOT,
+    DEFAULT,
+    EXACT,
+    EXTENSION,
+    PATH;
+
+    public static jakarta.servlet.http.MappingMatch toJakartaMappingMatch(MappingMatch from) {
+        switch (from) {
+            case CONTEXT_ROOT:
+                return jakarta.servlet.http.MappingMatch.CONTEXT_ROOT;
+            case DEFAULT:
+                return jakarta.servlet.http.MappingMatch.DEFAULT;
+            case EXACT:
+                return jakarta.servlet.http.MappingMatch.EXACT;
+            case EXTENSION:
+                return jakarta.servlet.http.MappingMatch.EXTENSION;
+            case PATH:
+                return jakarta.servlet.http.MappingMatch.PATH;
+            default:
+                throw new IllegalArgumentException("Unknown MappingMatch: " + from);
+        }
+    }
+
+    public static MappingMatch fromJakartaMappingMatch(jakarta.servlet.http.MappingMatch from) {
+        switch (from) {
+            case CONTEXT_ROOT:
+                return MappingMatch.CONTEXT_ROOT;
+            case DEFAULT:
+                return MappingMatch.DEFAULT;
+            case EXACT:
+                return MappingMatch.EXACT;
+            case EXTENSION:
+                return MappingMatch.EXTENSION;
+            case PATH:
+                return MappingMatch.PATH;
+            default:
+                throw new IllegalArgumentException("Unknown MappingMatch: " + from);
+        }
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/Part.java b/core/src/main/java/javax/servlet/http/Part.java
new file mode 100644
index 0000000000..61d37ca09f
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/Part.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 1997, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+
+public interface Part {
+    InputStream getInputStream() throws IOException;
+
+    String getContentType();
+
+    String getName();
+
+    String getSubmittedFileName();
+
+    long getSize();
+
+    void write(String fileName) throws IOException;
+
+    void delete() throws IOException;
+
+    String getHeader(String name);
+
+    Collection<String> getHeaders(String name);
+
+    Collection<String> getHeaderNames();
+
+    default jakarta.servlet.http.Part toJakartaPart() {
+        return new jakarta.servlet.http.Part() {
+            @Override
+            public InputStream getInputStream() throws IOException {
+                return Part.this.getInputStream();
+            }
+
+            @Override
+            public String getContentType() {
+                return Part.this.getContentType();
+            }
+
+            @Override
+            public String getName() {
+                return Part.this.getName();
+            }
+
+            @Override
+            public String getSubmittedFileName() {
+                return Part.this.getSubmittedFileName();
+            }
+
+            @Override
+            public long getSize() {
+                return Part.this.getSize();
+            }
+
+            @Override
+            public void write(String fileName) throws IOException {
+                Part.this.write(fileName);
+            }
+
+            @Override
+            public void delete() throws IOException {
+                Part.this.delete();
+            }
+
+            @Override
+            public String getHeader(String name) {
+                return Part.this.getHeader(name);
+            }
+
+            @Override
+            public Collection<String> getHeaders(String name) {
+                return Part.this.getHeaders(name);
+            }
+
+            @Override
+            public Collection<String> getHeaderNames() {
+                return Part.this.getHeaderNames();
+            }
+        };
+    }
+
+    static Part fromJakartaPart(jakarta.servlet.http.Part from) {
+        return new Part() {
+            @Override
+            public InputStream getInputStream() throws IOException {
+                return from.getInputStream();
+            }
+
+            @Override
+            public String getContentType() {
+                return from.getContentType();
+            }
+
+            @Override
+            public String getName() {
+                return from.getName();
+            }
+
+            @Override
+            public String getSubmittedFileName() {
+                return from.getSubmittedFileName();
+            }
+
+            @Override
+            public long getSize() {
+                return from.getSize();
+            }
+
+            @Override
+            public void write(String fileName) throws IOException {
+                from.write(fileName);
+            }
+
+            @Override
+            public void delete() throws IOException {
+                from.delete();
+            }
+
+            @Override
+            public String getHeader(String name) {
+                return from.getHeader(name);
+            }
+
+            @Override
+            public Collection<String> getHeaders(String name) {
+                return from.getHeaders(name);
+            }
+
+            @Override
+            public Collection<String> getHeaderNames() {
+                return from.getHeaderNames();
+            }
+
+            @Override
+            public jakarta.servlet.http.Part toJakartaPart() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/javax/servlet/http/PushBuilder.java b/core/src/main/java/javax/servlet/http/PushBuilder.java
new file mode 100644
index 0000000000..c0c09b0bb3
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/PushBuilder.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.http;
+
+import java.util.Set;
+
+public interface PushBuilder {
+    PushBuilder method(String method);
+
+    PushBuilder queryString(String queryString);
+
+    PushBuilder sessionId(String sessionId);
+
+    PushBuilder setHeader(String name, String value);
+
+    PushBuilder addHeader(String name, String value);
+
+    PushBuilder removeHeader(String name);
+
+    PushBuilder path(String path);
+
+    void push();
+
+    String getMethod();
+
+    String getQueryString();
+
+    String getSessionId();
+
+    Set<String> getHeaderNames();
+
+    String getHeader(String name);
+
+    String getPath();
+}
diff --git a/core/src/main/java/javax/servlet/http/WebConnection.java b/core/src/main/java/javax/servlet/http/WebConnection.java
new file mode 100644
index 0000000000..b094b77286
--- /dev/null
+++ b/core/src/main/java/javax/servlet/http/WebConnection.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates and others.
+ * All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package javax.servlet.http;
+
+import java.io.IOException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
+
+public interface WebConnection extends AutoCloseable {
+    ServletInputStream getInputStream() throws IOException;
+
+    ServletOutputStream getOutputStream() throws IOException;
+}
diff --git a/core/src/main/java/org/apache/commons/fileupload/FileItem.java b/core/src/main/java/org/apache/commons/fileupload/FileItem.java
new file mode 100644
index 0000000000..f8c3979dda
--- /dev/null
+++ b/core/src/main/java/org/apache/commons/fileupload/FileItem.java
@@ -0,0 +1,436 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.fileupload;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import org.apache.commons.fileupload2.core.FileItemHeadersProvider;
+
+/**
+ * <p> This class represents a file or form item that was received within a
+ * <code>multipart/form-data</code> POST request.
+ *
+ * <p> After retrieving an instance of this class from a {@code
+ * org.apache.commons.fileupload.FileUpload FileUpload} instance (see
+ * {@code org.apache.commons.fileupload.servlet.ServletFileUpload
+ * #parseRequest(javax.servlet.http.HttpServletRequest)}), you may
+ * either request all contents of the file at once using {@link #get()} or
+ * request an {@link java.io.InputStream InputStream} with
+ * {@link #getInputStream()} and process the file without attempting to load
+ * it into memory, which may come handy with large files.
+ *
+ * <p> While this interface does not extend
+ * <code>javax.activation.DataSource</code> per se (to avoid a seldom used
+ * dependency), several of the defined methods are specifically defined with
+ * the same signatures as methods in that interface. This allows an
+ * implementation of this interface to also implement
+ * <code>javax.activation.DataSource</code> with minimal additional work.
+ *
+ * @since 1.3 additionally implements FileItemHeadersSupport
+ */
+public interface FileItem {
+
+    // ------------------------------- Methods from javax.activation.DataSource
+
+    /**
+     * Returns an {@link java.io.InputStream InputStream} that can be
+     * used to retrieve the contents of the file.
+     *
+     * @return An {@link java.io.InputStream InputStream} that can be
+     *         used to retrieve the contents of the file.
+     *
+     * @throws IOException if an error occurs.
+     */
+    InputStream getInputStream() throws IOException;
+
+    /**
+     * Returns the content type passed by the browser or <code>null</code> if
+     * not defined.
+     *
+     * @return The content type passed by the browser or <code>null</code> if
+     *         not defined.
+     */
+    String getContentType();
+
+    /**
+     * Returns the original filename in the client's filesystem, as provided by
+     * the browser (or other client software). In most cases, this will be the
+     * base file name, without path information. However, some clients, such as
+     * the Opera browser, do include path information.
+     *
+     * @return The original filename in the client's filesystem.
+     * @throws InvalidFileNameException The file name contains a NUL character,
+     *   which might be an indicator of a security attack. If you intend to
+     *   use the file name anyways, catch the exception and use
+     *   InvalidFileNameException#getName().
+     */
+    String getName();
+
+    // ------------------------------------------------------- FileItem methods
+
+    /**
+     * Provides a hint as to whether or not the file contents will be read
+     * from memory.
+     *
+     * @return <code>true</code> if the file contents will be read from memory;
+     *         <code>false</code> otherwise.
+     */
+    boolean isInMemory();
+
+    /**
+     * Returns the size of the file item.
+     *
+     * @return The size of the file item, in bytes.
+     */
+    long getSize();
+
+    /**
+     * Returns the contents of the file item as an array of bytes.
+     *
+     * @return The contents of the file item as an array of bytes.
+     */
+    byte[] get();
+
+    /**
+     * Returns the contents of the file item as a String, using the specified
+     * encoding.  This method uses {@link #get()} to retrieve the
+     * contents of the item.
+     *
+     * @param encoding The character encoding to use.
+     *
+     * @return The contents of the item, as a string.
+     *
+     * @throws UnsupportedEncodingException if the requested character
+     *                                      encoding is not available.
+     */
+    String getString(String encoding) throws UnsupportedEncodingException;
+
+    /**
+     * Returns the contents of the file item as a String, using the default
+     * character encoding.  This method uses {@link #get()} to retrieve the
+     * contents of the item.
+     *
+     * @return The contents of the item, as a string.
+     */
+    String getString();
+
+    /**
+     * A convenience method to write an uploaded item to disk. The client code
+     * is not concerned with whether or not the item is stored in memory, or on
+     * disk in a temporary location. They just want to write the uploaded item
+     * to a file.
+     * <p>
+     * This method is not guaranteed to succeed if called more than once for
+     * the same item. This allows a particular implementation to use, for
+     * example, file renaming, where possible, rather than copying all of the
+     * underlying data, thus gaining a significant performance benefit.
+     *
+     * @param file The <code>File</code> into which the uploaded item should
+     *             be stored.
+     *
+     * @throws Exception if an error occurs.
+     */
+    void write(File file) throws Exception;
+
+    /**
+     * Deletes the underlying storage for a file item, including deleting any
+     * associated temporary disk file. Although this storage will be deleted
+     * automatically when the <code>FileItem</code> instance is garbage
+     * collected, this method can be used to ensure that this is done at an
+     * earlier time, thus preserving system resources.
+     */
+    void delete();
+
+    /**
+     * Returns the name of the field in the multipart form corresponding to
+     * this file item.
+     *
+     * @return The name of the form field.
+     */
+    String getFieldName();
+
+    /**
+     * Sets the field name used to reference this file item.
+     *
+     * @param name The name of the form field.
+     */
+    void setFieldName(String name);
+
+    /**
+     * Determines whether or not a <code>FileItem</code> instance represents
+     * a simple form field.
+     *
+     * @return <code>true</code> if the instance represents a simple form
+     *         field; <code>false</code> if it represents an uploaded file.
+     */
+    boolean isFormField();
+
+    /**
+     * Specifies whether or not a <code>FileItem</code> instance represents
+     * a simple form field.
+     *
+     * @param state <code>true</code> if the instance represents a simple form
+     *              field; <code>false</code> if it represents an uploaded file.
+     */
+    void setFormField(boolean state);
+
+    /**
+     * Returns an {@link java.io.OutputStream OutputStream} that can
+     * be used for storing the contents of the file.
+     *
+     * @return An {@link java.io.OutputStream OutputStream} that can be used
+     *         for storing the contensts of the file.
+     *
+     * @throws IOException if an error occurs.
+     */
+    OutputStream getOutputStream() throws IOException;
+
+    /**
+     * Returns the collection of headers defined locally within this item.
+     *
+     * @return the {@link FileItemHeaders} present for this item.
+     */
+    FileItemHeaders getHeaders();
+
+    /**
+     * Sets the headers read from within an item.  Implementations of
+     * {@link FileItem} or {@code FileItemStream} should implement this
+     * interface to be able to get the raw headers found within the item
+     * header block.
+     *
+     * @param headers the instance that holds onto the headers
+     *         for this instance.
+     */
+    void setHeaders(FileItemHeaders headers);
+
+    default org.apache.commons.fileupload2.core.FileItem toFileUpload2FileItem() {
+        return new org.apache.commons.fileupload2.core.FileItem() {
+            @Override
+            public org.apache.commons.fileupload2.core.FileItemHeaders getHeaders() {
+                return FileItem.this.getHeaders().toFileUpload2FileItemHeaders();
+            }
+
+            @Override
+            public FileItemHeadersProvider setHeaders(org.apache.commons.fileupload2.core.FileItemHeaders headers) {
+                FileItem.this.setHeaders(FileItemHeaders.fromFileUpload2FileItemHeaders(headers));
+                return this;
+            }
+
+            @Override
+            public org.apache.commons.fileupload2.core.FileItem delete() throws IOException {
+                FileItem.this.delete();
+                return this;
+            }
+
+            @Override
+            public byte[] get() {
+                return FileItem.this.get();
+            }
+
+            @Override
+            public String getContentType() {
+                return FileItem.this.getContentType();
+            }
+
+            @Override
+            public String getFieldName() {
+                return FileItem.this.getFieldName();
+            }
+
+            @Override
+            public InputStream getInputStream() throws IOException {
+                return FileItem.this.getInputStream();
+            }
+
+            @Override
+            @SuppressFBWarnings(value = "FILE_UPLOAD_FILENAME", justification = "for compatibility")
+            public String getName() {
+                return FileItem.this.getName();
+            }
+
+            @Override
+            public OutputStream getOutputStream() throws IOException {
+                return FileItem.this.getOutputStream();
+            }
+
+            @Override
+            public long getSize() {
+                return FileItem.this.getSize();
+            }
+
+            @Override
+            public String getString() {
+                return FileItem.this.getString();
+            }
+
+            @Override
+            public String getString(Charset toCharset) throws IOException {
+                return FileItem.this.getString(toCharset.name());
+            }
+
+            @Override
+            public boolean isFormField() {
+                return FileItem.this.isFormField();
+            }
+
+            @Override
+            public boolean isInMemory() {
+                return FileItem.this.isInMemory();
+            }
+
+            @Override
+            public org.apache.commons.fileupload2.core.FileItem setFieldName(String name) {
+                FileItem.this.setFieldName(name);
+                return this;
+            }
+
+            @Override
+            public org.apache.commons.fileupload2.core.FileItem setFormField(boolean state) {
+                FileItem.this.setFormField(state);
+                return this;
+            }
+
+            @Override
+            public org.apache.commons.fileupload2.core.FileItem write(Path file) throws IOException {
+                try {
+                    FileItem.this.write(file.toFile());
+                } catch (UncheckedIOException e) {
+                    throw e.getCause();
+                } catch (IOException e) {
+                    throw e;
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+                return this;
+            }
+        };
+    }
+
+    static FileItem fromFileUpload2FileItem(org.apache.commons.fileupload2.core.FileItem from) {
+        return new FileItem() {
+
+            @Override
+            public InputStream getInputStream() throws IOException {
+                return from.getInputStream();
+            }
+
+            @Override
+            public String getContentType() {
+                return from.getContentType();
+            }
+
+            @Override
+            public String getName() {
+                return from.getName();
+            }
+
+            @Override
+            public boolean isInMemory() {
+                return from.isInMemory();
+            }
+
+            @Override
+            public long getSize() {
+                return from.getSize();
+            }
+
+            @Override
+            public byte[] get() {
+                return from.get();
+            }
+
+            @Override
+            public String getString(String encoding) throws UnsupportedEncodingException {
+                try {
+                    return from.getString(Charset.forName(encoding));
+                } catch (UnsupportedEncodingException e) {
+                    throw e;
+                } catch (IOException e) {
+                    throw new UncheckedIOException(e);
+                }
+            }
+
+            @Override
+            public String getString() {
+                return from.getString();
+            }
+
+            @Override
+            public void write(File file) throws Exception {
+                from.write(file.toPath());
+            }
+
+            @Override
+            public void delete() {
+                try {
+                    from.delete();
+                } catch (IOException e) {
+                    throw new UncheckedIOException(e);
+                }
+            }
+
+            @Override
+            public String getFieldName() {
+                return from.getFieldName();
+            }
+
+            @Override
+            @SuppressFBWarnings(value = "RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT", justification = "for compatibility")
+            public void setFieldName(String name) {
+                from.setFieldName(name);
+            }
+
+            @Override
+            public boolean isFormField() {
+                return from.isFormField();
+            }
+
+            @Override
+            @SuppressFBWarnings(value = "RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT", justification = "for compatibility")
+            public void setFormField(boolean state) {
+                from.setFormField(state);
+            }
+
+            @Override
+            public OutputStream getOutputStream() throws IOException {
+                return from.getOutputStream();
+            }
+
+            @Override
+            public FileItemHeaders getHeaders() {
+                return FileItemHeaders.fromFileUpload2FileItemHeaders(from.getHeaders());
+            }
+
+            @Override
+            public void setHeaders(FileItemHeaders headers) {
+                from.setHeaders(headers.toFileUpload2FileItemHeaders());
+            }
+
+            @Override
+            public org.apache.commons.fileupload2.core.FileItem toFileUpload2FileItem() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/org/apache/commons/fileupload/FileItemHeaders.java b/core/src/main/java/org/apache/commons/fileupload/FileItemHeaders.java
new file mode 100644
index 0000000000..3b0add3493
--- /dev/null
+++ b/core/src/main/java/org/apache/commons/fileupload/FileItemHeaders.java
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.fileupload;
+
+import java.util.Iterator;
+
+/**
+ * <p> This class provides support for accessing the headers for a file or form
+ * item that was received within a <code>multipart/form-data</code> POST
+ * request.</p>
+ *
+ * @since 1.2.1
+ */
+public interface FileItemHeaders {
+
+    /**
+     * Returns the value of the specified part header as a <code>String</code>.
+     * <p>
+     * If the part did not include a header of the specified name, this method
+     * return <code>null</code>.  If there are multiple headers with the same
+     * name, this method returns the first header in the item.  The header
+     * name is case insensitive.
+     *
+     * @param name a <code>String</code> specifying the header name
+     * @return a <code>String</code> containing the value of the requested
+     * header, or <code>null</code> if the item does not have a header
+     * of that name
+     */
+    String getHeader(String name);
+
+    /**
+     * <p>
+     * Returns all the values of the specified item header as an
+     * <code>Iterator</code> of <code>String</code> objects.
+     * </p>
+     * <p>
+     * If the item did not include any headers of the specified name, this
+     * method returns an empty <code>Iterator</code>. The header name is
+     * case insensitive.
+     * </p>
+     *
+     * @param name a <code>String</code> specifying the header name
+     * @return an <code>Iterator</code> containing the values of the
+     * requested header. If the item does not have any headers of
+     * that name, return an empty <code>Iterator</code>
+     */
+    Iterator<String> getHeaders(String name);
+
+    /**
+     * <p>
+     * Returns an <code>Iterator</code> of all the header names.
+     * </p>
+     *
+     * @return an <code>Iterator</code> containing all of the names of
+     * headers provided with this file item. If the item does not have
+     * any headers return an empty <code>Iterator</code>
+     */
+    Iterator<String> getHeaderNames();
+
+    default org.apache.commons.fileupload2.core.FileItemHeaders toFileUpload2FileItemHeaders() {
+        return new org.apache.commons.fileupload2.core.FileItemHeaders() {
+            @Override
+            public void addHeader(String name, String value) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public String getHeader(String name) {
+                return FileItemHeaders.this.getHeader(name);
+            }
+
+            @Override
+            public Iterator<String> getHeaderNames() {
+                return FileItemHeaders.this.getHeaderNames();
+            }
+
+            @Override
+            public Iterator<String> getHeaders(String name) {
+                return FileItemHeaders.this.getHeaders(name);
+            }
+        };
+    }
+
+    static FileItemHeaders fromFileUpload2FileItemHeaders(org.apache.commons.fileupload2.core.FileItemHeaders from) {
+        return new FileItemHeaders() {
+            @Override
+            public String getHeader(String name) {
+                return from.getHeader(name);
+            }
+
+            @Override
+            public Iterator<String> getHeaders(String name) {
+                return from.getHeaders(name);
+            }
+
+            @Override
+            public Iterator<String> getHeaderNames() {
+                return from.getHeaderNames();
+            }
+
+            @Override
+            public org.apache.commons.fileupload2.core.FileItemHeaders toFileUpload2FileItemHeaders() {
+                return from;
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/org/apache/commons/fileupload/InvalidFileNameException.java b/core/src/main/java/org/apache/commons/fileupload/InvalidFileNameException.java
new file mode 100644
index 0000000000..49db964948
--- /dev/null
+++ b/core/src/main/java/org/apache/commons/fileupload/InvalidFileNameException.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.fileupload;
+
+/**
+ * This exception is thrown in case of an invalid file name.
+ * A file name is invalid, if it contains a NUL character.
+ * Attackers might use this to circumvent security checks:
+ * For example, a malicious user might upload a file with the name
+ * "foo.exe\0.png". This file name might pass security checks (i.e.
+ * checks for the extension ".png"), while, depending on the underlying
+ * C library, it might create a file named "foo.exe", as the NUL
+ * character is the string terminator in C.
+ */
+public class InvalidFileNameException extends RuntimeException {
+
+    /**
+     * Serial version UID, being used, if the exception
+     * is serialized.
+     */
+    private static final long serialVersionUID = 7922042602454350470L;
+
+    /**
+     * The file name causing the exception.
+     */
+    private final String name;
+
+    /**
+     * Creates a new instance.
+     *
+     * @param pName The file name causing the exception.
+     * @param pMessage A human readable error message.
+     */
+    public InvalidFileNameException(String pName, String pMessage) {
+        super(pMessage);
+        name = pName;
+    }
+
+    /**
+     * Returns the invalid file name.
+     *
+     * @return the invalid file name.
+     */
+    public String getName() {
+        return name;
+    }
+}
diff --git a/core/src/main/java/org/kohsuke/stapler/AcceptHeader.java b/core/src/main/java/org/kohsuke/stapler/AcceptHeader.java
index e6a850366d..83b6331f86 100644
--- a/core/src/main/java/org/kohsuke/stapler/AcceptHeader.java
+++ b/core/src/main/java/org/kohsuke/stapler/AcceptHeader.java
@@ -22,12 +22,12 @@ of this software and associated documentation files (the "Software"), to deal
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.Nullable;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.beanutils.Converter;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
diff --git a/core/src/main/java/org/kohsuke/stapler/Ancestor.java b/core/src/main/java/org/kohsuke/stapler/Ancestor.java
index 06ee8c4384..4857c9708f 100644
--- a/core/src/main/java/org/kohsuke/stapler/Ancestor.java
+++ b/core/src/main/java/org/kohsuke/stapler/Ancestor.java
@@ -23,7 +23,7 @@
 
 package org.kohsuke.stapler;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Information about ancestor of the "it" node.
diff --git a/core/src/main/java/org/kohsuke/stapler/AncestorInPath.java b/core/src/main/java/org/kohsuke/stapler/AncestorInPath.java
index ce860fd443..af682a90d0 100644
--- a/core/src/main/java/org/kohsuke/stapler/AncestorInPath.java
+++ b/core/src/main/java/org/kohsuke/stapler/AncestorInPath.java
@@ -23,12 +23,12 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.AncestorInPath.HandlerImpl;
 
 /**
diff --git a/core/src/main/java/org/kohsuke/stapler/AnnotationHandler.java b/core/src/main/java/org/kohsuke/stapler/AnnotationHandler.java
index cc80c9afbc..6c6340d833 100644
--- a/core/src/main/java/org/kohsuke/stapler/AnnotationHandler.java
+++ b/core/src/main/java/org/kohsuke/stapler/AnnotationHandler.java
@@ -23,8 +23,8 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.Annotation;
-import javax.servlet.ServletException;
 import org.apache.commons.beanutils.Converter;
 
 /**
diff --git a/core/src/main/java/org/kohsuke/stapler/AttributeKey.java b/core/src/main/java/org/kohsuke/stapler/AttributeKey.java
index 0edd470309..3c4c53f68c 100644
--- a/core/src/main/java/org/kohsuke/stapler/AttributeKey.java
+++ b/core/src/main/java/org/kohsuke/stapler/AttributeKey.java
@@ -1,9 +1,9 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import java.util.UUID;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 
 /**
  * Type-safe attribute accessor.
diff --git a/core/src/main/java/org/kohsuke/stapler/CompatibleFilter.java b/core/src/main/java/org/kohsuke/stapler/CompatibleFilter.java
new file mode 100644
index 0000000000..301f493bfd
--- /dev/null
+++ b/core/src/main/java/org/kohsuke/stapler/CompatibleFilter.java
@@ -0,0 +1,52 @@
+package org.kohsuke.stapler;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import java.io.IOException;
+
+public interface CompatibleFilter extends Filter {
+    /**
+     * @deprecated use {@link #init(FilterConfig)}
+     */
+    @Deprecated
+    default void init(javax.servlet.FilterConfig filterConfig) throws javax.servlet.ServletException {
+        try {
+            init(filterConfig.toJakartaFilterConfig());
+        } catch (ServletException e) {
+            throw new javax.servlet.ServletException(e);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #doFilter(ServletRequest, ServletResponse, FilterChain)}
+     */
+    @Deprecated
+    default void doFilter(
+            javax.servlet.ServletRequest request,
+            javax.servlet.ServletResponse response,
+            javax.servlet.FilterChain chain)
+            throws IOException, javax.servlet.ServletException {
+        try {
+            if (request instanceof javax.servlet.http.HttpServletRequest
+                    && response instanceof javax.servlet.http.HttpServletResponse) {
+                javax.servlet.http.HttpServletRequest httpRequest = (javax.servlet.http.HttpServletRequest) request;
+                javax.servlet.http.HttpServletResponse httpResponse = (javax.servlet.http.HttpServletResponse) response;
+                doFilter(
+                        httpRequest.toJakartaHttpServletRequest(),
+                        httpResponse.toJakartaHttpServletResponse(),
+                        chain.toJakartaFilterChain());
+            } else {
+                doFilter(
+                        request.toJakartaServletRequest(),
+                        response.toJakartaServletResponse(),
+                        chain.toJakartaFilterChain());
+            }
+        } catch (ServletException e) {
+            throw new javax.servlet.ServletException(e);
+        }
+    }
+}
diff --git a/core/src/main/java/org/kohsuke/stapler/CrumbIssuer.java b/core/src/main/java/org/kohsuke/stapler/CrumbIssuer.java
index b2272dad5c..1ecd6853de 100644
--- a/core/src/main/java/org/kohsuke/stapler/CrumbIssuer.java
+++ b/core/src/main/java/org/kohsuke/stapler/CrumbIssuer.java
@@ -1,7 +1,7 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.http.HttpSession;
 import java.util.UUID;
-import javax.servlet.http.HttpSession;
 
 /**
  * Generates a nonce value that allows us to protect against cross-site request forgery (CSRF) attacks.
diff --git a/core/src/main/java/org/kohsuke/stapler/DiagnosticThreadNameFilter.java b/core/src/main/java/org/kohsuke/stapler/DiagnosticThreadNameFilter.java
index d947f59e6c..e1dbc357b1 100644
--- a/core/src/main/java/org/kohsuke/stapler/DiagnosticThreadNameFilter.java
+++ b/core/src/main/java/org/kohsuke/stapler/DiagnosticThreadNameFilter.java
@@ -1,20 +1,20 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * {@link Filter} that sets the thread name to reflect the current request being processed.
  *
  * @author Kohsuke Kawaguchi
  */
-public class DiagnosticThreadNameFilter implements Filter {
+public class DiagnosticThreadNameFilter implements CompatibleFilter {
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
     }
diff --git a/core/src/main/java/org/kohsuke/stapler/DirectoryishDispatcher.java b/core/src/main/java/org/kohsuke/stapler/DirectoryishDispatcher.java
index 8d9a39769b..4158a10eb7 100644
--- a/core/src/main/java/org/kohsuke/stapler/DirectoryishDispatcher.java
+++ b/core/src/main/java/org/kohsuke/stapler/DirectoryishDispatcher.java
@@ -1,10 +1,10 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 
 /**
  * {@link Dispatcher} that tells browsers to append '/' to the request path and try again.
diff --git a/core/src/main/java/org/kohsuke/stapler/Dispatcher.java b/core/src/main/java/org/kohsuke/stapler/Dispatcher.java
index a47f903d37..435f553a0a 100644
--- a/core/src/main/java/org/kohsuke/stapler/Dispatcher.java
+++ b/core/src/main/java/org/kohsuke/stapler/Dispatcher.java
@@ -24,6 +24,7 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -31,7 +32,6 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 
 /**
  * Controls the dispatching of incoming HTTP requests.
diff --git a/core/src/main/java/org/kohsuke/stapler/Facet.java b/core/src/main/java/org/kohsuke/stapler/Facet.java
index 891ae12828..9511be50dc 100644
--- a/core/src/main/java/org/kohsuke/stapler/Facet.java
+++ b/core/src/main/java/org/kohsuke/stapler/Facet.java
@@ -26,6 +26,8 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -33,8 +35,6 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
 import org.apache.commons.discovery.ResourceNameIterator;
 import org.apache.commons.discovery.resource.ClassLoaders;
 import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
diff --git a/core/src/main/java/org/kohsuke/stapler/ForwardToView.java b/core/src/main/java/org/kohsuke/stapler/ForwardToView.java
index 540936b92c..15c783c93b 100644
--- a/core/src/main/java/org/kohsuke/stapler/ForwardToView.java
+++ b/core/src/main/java/org/kohsuke/stapler/ForwardToView.java
@@ -24,12 +24,12 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
 
 /**
  * {@link HttpResponse} that forwards to a {@link RequestDispatcher}, such as a view.
diff --git a/core/src/main/java/org/kohsuke/stapler/ForwardingFunction.java b/core/src/main/java/org/kohsuke/stapler/ForwardingFunction.java
index 0d5f7a760f..404cb50422 100644
--- a/core/src/main/java/org/kohsuke/stapler/ForwardingFunction.java
+++ b/core/src/main/java/org/kohsuke/stapler/ForwardingFunction.java
@@ -1,9 +1,9 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
-import javax.servlet.ServletException;
 
 /**
  * {@link Function} that forwards calls to another. Usually used
diff --git a/core/src/main/java/org/kohsuke/stapler/Function.java b/core/src/main/java/org/kohsuke/stapler/Function.java
index 4e1c06063b..b0a1b6a5bf 100644
--- a/core/src/main/java/org/kohsuke/stapler/Function.java
+++ b/core/src/main/java/org/kohsuke/stapler/Function.java
@@ -23,6 +23,9 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodHandle;
@@ -38,9 +41,6 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.stapler.interceptor.Interceptor;
 import org.kohsuke.stapler.interceptor.InterceptorAnnotation;
 
@@ -177,11 +177,11 @@ Object bindAndInvoke(Object o, StaplerRequest req, StaplerResponse rsp, Object..
             // find the rest of the arguments. either known types, or with annotations
             for( int i=headArgs.length; i<types.length; i++ ) {
                 Class t = types[i];
-                if(t==StaplerRequest.class || t==HttpServletRequest.class) {
+                if (t == StaplerRequest.class || t == HttpServletRequest.class || t == javax.servlet.http.HttpServletRequest.class) {
                     arguments[i] = req;
                     continue;
                 }
-                if(t==StaplerResponse.class || t==HttpServletResponse.class) {
+                if (t == StaplerResponse.class || t == HttpServletResponse.class || t == javax.servlet.http.HttpServletResponse.class) {
                     arguments[i] = rsp;
                     continue;
                 }
diff --git a/core/src/main/java/org/kohsuke/stapler/Header.java b/core/src/main/java/org/kohsuke/stapler/Header.java
index 7186493265..6ca9031d69 100644
--- a/core/src/main/java/org/kohsuke/stapler/Header.java
+++ b/core/src/main/java/org/kohsuke/stapler/Header.java
@@ -23,12 +23,12 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.Header.HandlerImpl;
 
 /**
diff --git a/core/src/main/java/org/kohsuke/stapler/HttpDeletable.java b/core/src/main/java/org/kohsuke/stapler/HttpDeletable.java
index aabcfc185a..23d9f32dad 100644
--- a/core/src/main/java/org/kohsuke/stapler/HttpDeletable.java
+++ b/core/src/main/java/org/kohsuke/stapler/HttpDeletable.java
@@ -23,9 +23,9 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 
 /**
  * Marks the object that can handle HTTP DELETE.
diff --git a/core/src/main/java/org/kohsuke/stapler/HttpRedirect.java b/core/src/main/java/org/kohsuke/stapler/HttpRedirect.java
index 53ab491067..4e27d657ff 100644
--- a/core/src/main/java/org/kohsuke/stapler/HttpRedirect.java
+++ b/core/src/main/java/org/kohsuke/stapler/HttpRedirect.java
@@ -24,9 +24,9 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * {@link HttpResponse} that dose HTTP 302 redirect.
diff --git a/core/src/main/java/org/kohsuke/stapler/HttpResponse.java b/core/src/main/java/org/kohsuke/stapler/HttpResponse.java
index 44306b8670..26b16ebdf1 100644
--- a/core/src/main/java/org/kohsuke/stapler/HttpResponse.java
+++ b/core/src/main/java/org/kohsuke/stapler/HttpResponse.java
@@ -23,8 +23,8 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
-import javax.servlet.ServletException;
 
 /**
  * Object that represents the HTTP response, which is defined as a capability to produce the response.
diff --git a/core/src/main/java/org/kohsuke/stapler/HttpResponseRenderer.java b/core/src/main/java/org/kohsuke/stapler/HttpResponseRenderer.java
index 871cf3fcc4..730f327712 100644
--- a/core/src/main/java/org/kohsuke/stapler/HttpResponseRenderer.java
+++ b/core/src/main/java/org/kohsuke/stapler/HttpResponseRenderer.java
@@ -23,12 +23,12 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import net.sf.json.JSON;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
diff --git a/core/src/main/java/org/kohsuke/stapler/HttpResponses.java b/core/src/main/java/org/kohsuke/stapler/HttpResponses.java
index a8cd816c39..40cf349dac 100644
--- a/core/src/main/java/org/kohsuke/stapler/HttpResponses.java
+++ b/core/src/main/java/org/kohsuke/stapler/HttpResponses.java
@@ -25,12 +25,12 @@
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URL;
 import java.util.ServiceLoader;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * Factory for {@link HttpResponse}.
diff --git a/core/src/main/java/org/kohsuke/stapler/IndexDispatcher.java b/core/src/main/java/org/kohsuke/stapler/IndexDispatcher.java
index c9908efcd3..5ba48e6cb6 100644
--- a/core/src/main/java/org/kohsuke/stapler/IndexDispatcher.java
+++ b/core/src/main/java/org/kohsuke/stapler/IndexDispatcher.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 
 /**
  * {@link Dispatcher} for url=/ that handles the tail of an URL.
diff --git a/core/src/main/java/org/kohsuke/stapler/IndexHtmlDispatcher.java b/core/src/main/java/org/kohsuke/stapler/IndexHtmlDispatcher.java
index 2c2c34303a..03ac1e6297 100644
--- a/core/src/main/java/org/kohsuke/stapler/IndexHtmlDispatcher.java
+++ b/core/src/main/java/org/kohsuke/stapler/IndexHtmlDispatcher.java
@@ -1,10 +1,10 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 
 /**
  * Serve {@code index.html} from {@code WEB-INF/side-files} if that exists.
diff --git a/core/src/main/java/org/kohsuke/stapler/IndexViewDispatcher.java b/core/src/main/java/org/kohsuke/stapler/IndexViewDispatcher.java
index d13e2029e4..e9ad533e59 100644
--- a/core/src/main/java/org/kohsuke/stapler/IndexViewDispatcher.java
+++ b/core/src/main/java/org/kohsuke/stapler/IndexViewDispatcher.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 
 /**
  * {@link Dispatcher} that deals with the "index" view pages that are used when the request path doesn't contain
diff --git a/core/src/main/java/org/kohsuke/stapler/LimitedTo.java b/core/src/main/java/org/kohsuke/stapler/LimitedTo.java
index 338cea7be9..88a5d6aab3 100644
--- a/core/src/main/java/org/kohsuke/stapler/LimitedTo.java
+++ b/core/src/main/java/org/kohsuke/stapler/LimitedTo.java
@@ -23,12 +23,12 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.interceptor.Interceptor;
 import org.kohsuke.stapler.interceptor.InterceptorAnnotation;
 
diff --git a/core/src/main/java/org/kohsuke/stapler/MetaClass.java b/core/src/main/java/org/kohsuke/stapler/MetaClass.java
index b9f8c00d31..296a2fe798 100644
--- a/core/src/main/java/org/kohsuke/stapler/MetaClass.java
+++ b/core/src/main/java/org/kohsuke/stapler/MetaClass.java
@@ -25,6 +25,8 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import jakarta.annotation.PostConstruct;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
@@ -33,8 +35,6 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONArray;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
@@ -148,7 +148,7 @@ public class MetaClass extends TearOffSupport {
         for (Facet f : webApp.facets)
             f.buildIndexDispatchers(this, dispatchers);
 
-        Dispatcher d = IndexHtmlDispatcher.make(webApp.context, clazz);
+        Dispatcher d = IndexHtmlDispatcher.make(webApp.getServletContext(), clazz);
         if (d!=null)
             dispatchers.add(d);
 
diff --git a/core/src/main/java/org/kohsuke/stapler/NameBasedDispatcher.java b/core/src/main/java/org/kohsuke/stapler/NameBasedDispatcher.java
index 86c6e53e9c..b766540628 100644
--- a/core/src/main/java/org/kohsuke/stapler/NameBasedDispatcher.java
+++ b/core/src/main/java/org/kohsuke/stapler/NameBasedDispatcher.java
@@ -23,9 +23,9 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 
 /**
  * @author Kohsuke Kawaguchi
diff --git a/core/src/main/java/org/kohsuke/stapler/PreInvokeInterceptedFunction.java b/core/src/main/java/org/kohsuke/stapler/PreInvokeInterceptedFunction.java
index 69ac961ac9..17d425d38e 100644
--- a/core/src/main/java/org/kohsuke/stapler/PreInvokeInterceptedFunction.java
+++ b/core/src/main/java/org/kohsuke/stapler/PreInvokeInterceptedFunction.java
@@ -1,7 +1,7 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.interceptor.Interceptor;
 import org.kohsuke.stapler.interceptor.InterceptorAnnotation;
 import org.kohsuke.stapler.interceptor.Stage;
diff --git a/core/src/main/java/org/kohsuke/stapler/QueryParameter.java b/core/src/main/java/org/kohsuke/stapler/QueryParameter.java
index 3113ea915c..4b4b807c92 100644
--- a/core/src/main/java/org/kohsuke/stapler/QueryParameter.java
+++ b/core/src/main/java/org/kohsuke/stapler/QueryParameter.java
@@ -23,12 +23,12 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.QueryParameter.HandlerImpl;
 
 /**
diff --git a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java
index 4e38565d6c..794f072f35 100644
--- a/core/src/main/java/org/kohsuke/stapler/RequestImpl.java
+++ b/core/src/main/java/org/kohsuke/stapler/RequestImpl.java
@@ -23,16 +23,30 @@
 
 package org.kohsuke.stapler;
 
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.Part;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -51,12 +65,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import java.util.stream.Stream;
 import net.sf.json.JSON;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
@@ -66,12 +75,15 @@
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.Converter;
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.fileupload.FileCountLimitExceededException;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadBase;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload2.core.DiskFileItem;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileUploadByteCountLimitException;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.core.FileUploadFileCountLimitException;
+import org.apache.commons.fileupload2.core.FileUploadSizeException;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
 import org.jvnet.tiger_types.Lister;
 import org.kohsuke.stapler.bind.Bound;
 import org.kohsuke.stapler.bind.BoundObjectTable;
@@ -131,7 +143,7 @@ public class RequestImpl extends HttpServletRequestWrapper implements StaplerReq
 
     /**
      * Limits the number of form fields that can be processed in one multipart/form-data request.
-     * Used to set {@link org.apache.commons.fileupload.servlet.ServletFileUpload#setFileCountMax(long)}.
+     * Used to set {@link org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload#setFileCountMax(long)}.
      * Despite the name, this applies to all form fields, not just actual file attachments.
      * Set to {@code -1} to disable limits.
      */
@@ -139,7 +151,7 @@ public class RequestImpl extends HttpServletRequestWrapper implements StaplerReq
 
     /**
      * Limits the size (in bytes) of individual fields that can be processed in one multipart/form-data request.
-     * Used to set {@link org.apache.commons.fileupload.servlet.ServletFileUpload#setFileSizeMax(long)}.
+     * Used to set {@link org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload#setFileSizeMax(long)}.
      * Despite the name, this applies to all form fields, not just actual file attachments.
      * Set to {@code -1} to disable limits.
      */
@@ -147,7 +159,7 @@ public class RequestImpl extends HttpServletRequestWrapper implements StaplerReq
 
     /**
      * Limits the total request size (in bytes) that can be processed in one multipart/form-data request.
-     * Used to set {@link org.apache.commons.fileupload.servlet.ServletFileUpload#setSizeMax(long)}.
+     * Used to set {@link org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload#setSizeMax(long)}.
      * Set to {@code -1} to disable limits.
      */
     private static /* nonfinal for Jenkins script console */ long FILEUPLOAD_MAX_SIZE = Long.getLong(RequestImpl.class.getName() + ".FILEUPLOAD_MAX_SIZE", -1);
@@ -208,10 +220,15 @@ public String getOriginalRestOfPath() {
     }
 
     @Override
+    @WithBridgeMethods(value = javax.servlet.ServletContext.class, adapterMethod = "fromJakartaServletContext")
     public ServletContext getServletContext() {
         return stapler.getServletContext();
     }
 
+    private Object fromJakartaServletContext(ServletContext servletContext, Class<?> type) {
+        return javax.servlet.ServletContext.fromJakartServletContext(servletContext);
+    }
+
     @Override
     public String getParameter(String name) {
         if(isMultipart()) {
@@ -294,16 +311,31 @@ public StringBuffer getRequestURLWithQueryString() {
     }
 
     @Override
+    @WithBridgeMethods(value = javax.servlet.RequestDispatcher.class, adapterMethod = "fromJakartaRequestDispatcher")
+    public RequestDispatcher getRequestDispatcher(String path) {
+        return super.getRequestDispatcher(path);
+    }
+
+    @Override
+    @WithBridgeMethods(value = javax.servlet.DispatcherType.class, adapterMethod = "fromJakartaDispatcherType")
+    public DispatcherType getDispatcherType() {
+        return super.getDispatcherType();
+    }
+
+    @Override
+    @WithBridgeMethods(value = javax.servlet.RequestDispatcher.class, adapterMethod = "fromJakartaRequestDispatcher")
     public RequestDispatcher getView(Object it,String viewName) throws IOException {
         return getView(Klass.java(it.getClass()),it,viewName);
     }
 
     @Override
+    @WithBridgeMethods(value = javax.servlet.RequestDispatcher.class, adapterMethod = "fromJakartaRequestDispatcher")
     public RequestDispatcher getView(Class clazz, String viewName) throws IOException {
         return getView(Klass.java(clazz),null,viewName);
     }
 
     @Override
+    @WithBridgeMethods(value = javax.servlet.RequestDispatcher.class, adapterMethod = "fromJakartaRequestDispatcher")
     public RequestDispatcher getView(Klass<?> clazz, String viewName) throws IOException {
         return getView(clazz,null,viewName);
     }
@@ -318,6 +350,14 @@ public RequestDispatcher getView(Klass<?> clazz, Object it, String viewName) thr
         return null;
     }
 
+    private Object fromJakartaRequestDispatcher(RequestDispatcher requestDispatcher, Class<?> type) {
+        return javax.servlet.RequestDispatcher.fromJakartaRequestDispatcher(requestDispatcher);
+    }
+
+    private Object fromJakartaDispatcherType(DispatcherType dispatcherType, Class<?> type) {
+        return javax.servlet.DispatcherType.fromJakartaDispatcherType(dispatcherType);
+    }
+
     @Override
     public String getRootPath() {
         StringBuffer buf = super.getRequestURL();
@@ -673,6 +713,19 @@ private static void fill(Object bean, String key, Object value) {
         }
     }
 
+    /**
+     * @deprecated use {@link #authenticate(HttpServletResponse)}
+     */
+    @Deprecated
+    @Override
+    public boolean authenticate(javax.servlet.http.HttpServletResponse response) throws IOException, javax.servlet.ServletException {
+        try {
+            return authenticate(response.toJakartaHttpServletResponse());
+        } catch (ServletException e) {
+            throw new javax.servlet.ServletException(e);
+        }
+    }
+
     /**
      * Information about the type.
      */
@@ -1056,7 +1109,7 @@ private void parseMultipartFormData() throws ServletException {
 
         parsedFormData = new HashMap<>();
         parsedFormDataFormFields = new HashMap<>();
-        ServletFileUpload upload;
+        JakartaServletFileUpload<DiskFileItem, DiskFileItemFactory> upload;
         File tmpDir;
         try {
             tmpDir = Files.createTempDirectory("jenkins-stapler-uploads").toFile();
@@ -1064,7 +1117,7 @@ private void parseMultipartFormData() throws ServletException {
             throw new ServletException("Error creating temporary directory", e);
         }
         tmpDir.deleteOnExit();
-        upload = new ServletFileUpload(new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, tmpDir));
+        upload = new JakartaServletDiskFileUpload(DiskFileItemFactory.builder().setFile(tmpDir).get());
         upload.setFileCountMax(FILEUPLOAD_MAX_FILES);
         upload.setFileSizeMax(FILEUPLOAD_MAX_FILE_SIZE);
         upload.setSizeMax(FILEUPLOAD_MAX_SIZE);
@@ -1075,11 +1128,11 @@ private void parseMultipartFormData() throws ServletException {
                     parsedFormDataFormFields.put(fi.getFieldName(),fi.getString());
                 }
             }
-        } catch (FileCountLimitExceededException e) {
+        } catch (FileUploadFileCountLimitException e) {
             throw new ServletException("File upload field count limit exceeded. Consider setting the Java system property " + RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILES to a value greater than " + FILEUPLOAD_MAX_FILES + ", or to -1 to disable this limit.", e);
-        } catch (FileUploadBase.FileSizeLimitExceededException e) {
+        } catch (FileUploadByteCountLimitException e) {
             throw new ServletException("File upload field size limit exceeded. Consider setting the Java system property " + RequestImpl.class.getName() + ".FILEUPLOAD_MAX_FILE_SIZE to a value greater than " + FILEUPLOAD_MAX_FILE_SIZE + ", or to -1 to disable this limit.", e);
-        } catch (FileUploadBase.SizeLimitExceededException e) {
+        } catch (FileUploadSizeException e) {
             throw new ServletException("File upload total size limit exceeded. Consider setting the Java system property " + RequestImpl.class.getName() + ".FILEUPLOAD_MAX_SIZE to a value greater than " + FILEUPLOAD_MAX_SIZE + ", or to -1 to disable this limit.", e);
         } catch (FileUploadException e) {
             throw new ServletException(e);
@@ -1116,10 +1169,12 @@ public JSONObject getSubmittedForm() throws ServletException {
                     if (item.getContentType() == null && getCharacterEncoding() != null) {
                         // JENKINS-11543: If client doesn't set charset per part, use request encoding
                         try {
-                            p = item.getString(getCharacterEncoding());
+                            p = item.getString(Charset.forName(getCharacterEncoding()));
                         } catch (java.io.UnsupportedEncodingException uee) {
                             LOGGER.log(Level.WARNING, "Request has unsupported charset, using default for 'json' parameter", uee);
                             p = item.getString();
+                        } catch (IOException e) {
+                            throw new UncheckedIOException(e);
                         }
                     } else {
                         p = item.getString();
@@ -1158,6 +1213,7 @@ private boolean isMultipart() {
     }
 
     @Override
+    @WithBridgeMethods(value = org.apache.commons.fileupload.FileItem.class, adapterMethod = "fromFileUpload2FileItem")
     public FileItem getFileItem(String name) throws ServletException, IOException {
         parseMultipartFormData();
         if(parsedFormData==null)    return null;
@@ -1166,5 +1222,55 @@ public FileItem getFileItem(String name) throws ServletException, IOException {
         return item;
     }
 
+    private Object fromFileUpload2FileItem(FileItem fileItem, Class<?> type) {
+        return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(fileItem);
+    }
+
+    @Override
+    @WithBridgeMethods(value = javax.servlet.ServletInputStream.class, adapterMethod = "fromJakartaServletInputStream")
+    public ServletInputStream getInputStream() throws IOException {
+        return super.getInputStream();
+    }
+
+    private Object fromJakartaServletInputStream(ServletInputStream inputStream, Class<?> type) {
+        return javax.servlet.ServletInputStream.fromJakartaServletInputStream(inputStream);
+    }
+
+    @Override
+    @WithBridgeMethods(value = javax.servlet.http.Cookie[].class, adapterMethod = "fromJakartaCookies")
+    public Cookie[] getCookies() {
+        return super.getCookies();
+    }
+
+    private Object fromJakartaCookies(Cookie[] cookies, Class<?> type) {
+        return Stream.of(cookies).map(javax.servlet.http.Cookie::fromJakartaServletHttpCookie).toArray(javax.servlet.http.Cookie[]::new);
+    }
+
+    @Override
+    @WithBridgeMethods(value = javax.servlet.http.HttpSession.class, adapterMethod = "fromJakartaHttpSession")
+    public HttpSession getSession(boolean create) {
+        return super.getSession(create);
+    }
+
+    @Override
+    @WithBridgeMethods(value = javax.servlet.http.HttpSession.class, adapterMethod = "fromJakartaHttpSession")
+    public HttpSession getSession() {
+        return super.getSession();
+    }
+
+    private Object fromJakartaHttpSession(HttpSession httpSession, Class<?> type) {
+        return javax.servlet.http.HttpSession.fromJakartaHttpSession(httpSession);
+    }
+
+    @Override
+    @WithBridgeMethods(value = javax.servlet.http.Part.class, adapterMethod = "fromJakartaPart")
+    public Part getPart(String name) throws IOException, ServletException {
+        return super.getPart(name);
+    }
+
+    private Object fromJakartaPart(Part part, Class<?> type) {
+        return javax.servlet.http.Part.fromJakartaPart(part);
+    }
+
     private static final Logger LOGGER = Logger.getLogger(RequestImpl.class.getName());
 }
diff --git a/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java b/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java
index 83aadf6548..6e5f1ae631 100644
--- a/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java
+++ b/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java
@@ -23,9 +23,15 @@
 
 package org.kohsuke.stapler;
 
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import com.jcraft.jzlib.GZIPOutputStream;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,11 +46,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
 import net.sf.json.JsonConfig;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.stapler.compression.CompressionFilter;
@@ -86,6 +87,7 @@ public ResponseImpl(Stapler stapler, HttpServletResponse response) {
     }
 
     @Override
+    @WithBridgeMethods(value = javax.servlet.ServletOutputStream.class, adapterMethod = "fromJakartaServletOutputStream")
     public ServletOutputStream getOutputStream() throws IOException {
         if(mode==OutputMode.CHAR)
             throw new IllegalStateException("getWriter has already been called. Its call site is in the nested exception",origin);
@@ -95,6 +97,10 @@ public ServletOutputStream getOutputStream() throws IOException {
         return (ServletOutputStream)output;
     }
 
+    private Object fromJakartaServletOutputStream(ServletOutputStream outputStream, Class<?> type) {
+        return javax.servlet.ServletOutputStream.fromJakartaServletOutputStream(outputStream);
+    }
+
     @Override
     public PrintWriter getWriter() throws IOException {
         if(mode==OutputMode.BYTE)
@@ -131,6 +137,15 @@ public void forwardToPreviousPage(StaplerRequest request) throws ServletExceptio
         sendRedirect(referer);
     }
 
+    /**
+     * @deprecated use {@link #addCookie(Cookie)}
+     */
+    @Deprecated
+    @Override
+    public void addCookie(javax.servlet.http.Cookie cookie) {
+        super.addCookie(javax.servlet.http.Cookie.toJakartaServletHttpCookie(cookie));
+    }
+
     @Override
     public void sendRedirect(@NonNull String url) throws IOException {
         // WebSphere doesn't apparently handle relative URLs, so
@@ -327,6 +342,15 @@ public OutputStream getCompressedOutputStream(HttpServletRequest req) throws IOE
         return recordOutput(new FilterServletOutputStream(new GZIPOutputStream(super.getOutputStream()), super.getOutputStream()));
     }
 
+    /**
+     * @deprecated use {@link #getCompressedWriter(HttpServletRequest)}
+     */
+    @Deprecated
+    @Override
+    public OutputStream getCompressedOutputStream(javax.servlet.http.HttpServletRequest req) throws IOException {
+        return getCompressedOutputStream(req.toJakartaHttpServletRequest());
+    }
+
     @Override
     public Writer getCompressedWriter(HttpServletRequest req) throws IOException {
         if (mode!=null)
@@ -344,6 +368,15 @@ public Writer getCompressedWriter(HttpServletRequest req) throws IOException {
         return recordOutput(new PrintWriter(new OutputStreamWriter(new GZIPOutputStream(super.getOutputStream()),getCharacterEncoding())));
     }
 
+    /**
+     * @deprecated use {@link #getCompressedWriter(HttpServletRequest)}
+     */
+    @Deprecated
+    @Override
+    public Writer getCompressedWriter(javax.servlet.http.HttpServletRequest req) throws IOException {
+        return getCompressedWriter(req.toJakartaHttpServletRequest());
+    }
+
     @Override
     public int reverseProxyTo(URL url, StaplerRequest req) throws IOException {
         HttpURLConnection con = openConnection(url);
diff --git a/core/src/main/java/org/kohsuke/stapler/ScriptRequestDispatcher.java b/core/src/main/java/org/kohsuke/stapler/ScriptRequestDispatcher.java
index 8a12bd5d7c..67c383802a 100644
--- a/core/src/main/java/org/kohsuke/stapler/ScriptRequestDispatcher.java
+++ b/core/src/main/java/org/kohsuke/stapler/ScriptRequestDispatcher.java
@@ -27,13 +27,13 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 
 /**
  * Implements a RequestDispatcher for a given model node and view. Unlike dispatchers created through
diff --git a/core/src/main/java/org/kohsuke/stapler/SelectionInterceptedFunction.java b/core/src/main/java/org/kohsuke/stapler/SelectionInterceptedFunction.java
index c892fae356..39f103019e 100644
--- a/core/src/main/java/org/kohsuke/stapler/SelectionInterceptedFunction.java
+++ b/core/src/main/java/org/kohsuke/stapler/SelectionInterceptedFunction.java
@@ -1,7 +1,7 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.interceptor.Interceptor;
 import org.kohsuke.stapler.interceptor.InterceptorAnnotation;
 
diff --git a/core/src/main/java/org/kohsuke/stapler/Stapler.java b/core/src/main/java/org/kohsuke/stapler/Stapler.java
index 66c983951a..812330740b 100644
--- a/core/src/main/java/org/kohsuke/stapler/Stapler.java
+++ b/core/src/main/java/org/kohsuke/stapler/Stapler.java
@@ -23,7 +23,17 @@
 
 package org.kohsuke.stapler;
 
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.DataInputStream;
 import java.io.EOFException;
 import java.io.File;
@@ -59,15 +69,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONObject;
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.beanutils.ConvertUtils;
@@ -76,7 +77,7 @@
 import org.apache.commons.beanutils.converters.DoubleConverter;
 import org.apache.commons.beanutils.converters.FloatConverter;
 import org.apache.commons.beanutils.converters.IntegerConverter;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.stapler.bind.BoundObjectTable;
 
@@ -1152,6 +1153,20 @@ public FileItem convert(Class type, Object value) {
             }
         }, FileItem.class);
 
+        CONVERT_UTILS.register(new Converter() {
+            @Override
+            public org.apache.commons.fileupload.FileItem convert(Class type, Object value) {
+                if (value == null) {
+                    return null;
+                }
+                try {
+                    return org.apache.commons.fileupload.FileItem.fromFileUpload2FileItem(Stapler.getCurrentRequest().getFileItem(value.toString()));
+                } catch (ServletException | IOException e) {
+                    throw new ConversionException(e);
+                }
+            }
+        }, org.apache.commons.fileupload.FileItem.class);
+
         // mapping for boxed types should map null to null, instead of null to zero.
         CONVERT_UTILS.register(new IntegerConverter(null),Integer.class);
         CONVERT_UTILS.register(new FloatConverter(null),Float.class);
@@ -1211,4 +1226,24 @@ public static Object htmlSafeArgument(Object o) {
 
         return escape(o.toString());
     }
+
+    @Override
+    @WithBridgeMethods(value = javax.servlet.ServletConfig.class, adapterMethod = "fromJakartaServletConfig")
+    public ServletConfig getServletConfig() {
+        return super.getServletConfig();
+    }
+
+    private Object fromJakartaServletConfig(ServletConfig servletConfig, Class<?> type) {
+        return javax.servlet.ServletConfig.fromJakartaServletConfig(servletConfig);
+    }
+
+    @Override
+    @WithBridgeMethods(value = javax.servlet.ServletContext.class, adapterMethod = "fromJakartaServletContext")
+    public ServletContext getServletContext() {
+        return super.getServletContext();
+    }
+
+    private Object fromJakartaServletContext(ServletContext servletContext, Class<?> type) {
+        return javax.servlet.ServletContext.fromJakartServletContext(servletContext);
+    }
 }
diff --git a/core/src/main/java/org/kohsuke/stapler/StaplerRequest.java b/core/src/main/java/org/kohsuke/stapler/StaplerRequest.java
index 8171fb103d..6a0de00e78 100644
--- a/core/src/main/java/org/kohsuke/stapler/StaplerRequest.java
+++ b/core/src/main/java/org/kohsuke/stapler/StaplerRequest.java
@@ -23,22 +23,23 @@
 
 package org.kohsuke.stapler;
 
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
 import org.kohsuke.stapler.bind.BoundObjectTable;
 import org.kohsuke.stapler.json.SubmittedForm;
 import org.kohsuke.stapler.lang.Klass;
@@ -49,7 +50,7 @@
  * @see Stapler#getCurrentRequest()
  * @author Kohsuke Kawaguchi
  */
-public interface StaplerRequest extends HttpServletRequest {
+public interface StaplerRequest extends HttpServletRequest, javax.servlet.http.HttpServletRequest {
     /**
      * Gets the {@link Stapler} instance that this belongs to.
      */
@@ -90,6 +91,7 @@ public interface StaplerRequest extends HttpServletRequest {
      * dispatcher servlet.
      */
     @Override
+    @WithBridgeMethods(javax.servlet.ServletContext.class)
     ServletContext getServletContext();
 
     /**
@@ -119,11 +121,13 @@ public interface StaplerRequest extends HttpServletRequest {
      * @return null
      *      if neither JSP nor Jelly is not found by the given name.
      */
+    @WithBridgeMethods(javax.servlet.RequestDispatcher.class)
     RequestDispatcher getView(Object it,String viewName) throws IOException;
 
     /**
      * Convenience method to call {@link #getView(Klass, String)} with {@link Class}.
      */
+    @WithBridgeMethods(javax.servlet.RequestDispatcher.class)
     RequestDispatcher getView(Class clazz,String viewName) throws IOException;
 
     /**
@@ -136,6 +140,7 @@ public interface StaplerRequest extends HttpServletRequest {
      * {@code getView(it.getClass(),viewName)} and {@code getView(it,viewName)}
      * aren't the same thing.
      */
+    @WithBridgeMethods(javax.servlet.RequestDispatcher.class)
     RequestDispatcher getView(Klass<?> clazz, String viewName) throws IOException;
 
     /**
@@ -497,6 +502,7 @@ public interface StaplerRequest extends HttpServletRequest {
      *      This includes the case where the name corresponds to a simple
      *      form field (like textbox, checkbox, etc.) 
      */
+    @WithBridgeMethods(org.apache.commons.fileupload.FileItem.class)
     FileItem getFileItem(String name) throws ServletException, IOException;
 
     /**
diff --git a/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java b/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java
index 3b73602286..2d6ca5c305 100644
--- a/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java
+++ b/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java
@@ -24,15 +24,15 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.net.URL;
 import java.net.URLConnection;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JsonConfig;
 import org.kohsuke.stapler.export.DataWriter;
 import org.kohsuke.stapler.export.ExportConfig;
@@ -46,7 +46,7 @@
  * @see Stapler#getCurrentResponse()
  * @author Kohsuke Kawaguchi
  */
-public interface StaplerResponse extends HttpServletResponse {
+public interface StaplerResponse extends HttpServletResponse, javax.servlet.http.HttpServletResponse {
     /**
      * Evaluates the url against the given object and
      * forwards the request to the result.
@@ -214,12 +214,32 @@ default void serveExposedBean(StaplerRequest req, Object exposedBean, ExportConf
      */
     OutputStream getCompressedOutputStream(HttpServletRequest req) throws IOException;
 
+    default OutputStream getCompressedOutputStream(StaplerRequest req) throws IOException {
+        return getCompressedOutputStream((HttpServletRequest) req);
+    }
+
+    /**
+     * @deprecated use {@link #getCompressedOutputStream(HttpServletRequest)}
+     */
+    @Deprecated
+    OutputStream getCompressedOutputStream(javax.servlet.http.HttpServletRequest req) throws IOException;
+
     /**
      * Works like {@link #getCompressedOutputStream(HttpServletRequest)} but this
      * method is for {@link #getWriter()}.
      */
     Writer getCompressedWriter(HttpServletRequest req) throws IOException;
 
+    default Writer getCompressedWriter(StaplerRequest req) throws IOException {
+        return getCompressedWriter((HttpServletRequest) req);
+    }
+
+    /**
+     * @deprecated use {@link #getCompressedWriter(HttpServletRequest)}
+     */
+    @Deprecated
+    Writer getCompressedWriter(javax.servlet.http.HttpServletRequest req) throws IOException;
+
     /**
      * Performs the reverse proxy to the given URL.
      *
diff --git a/core/src/main/java/org/kohsuke/stapler/StaplerResponseWrapper.java b/core/src/main/java/org/kohsuke/stapler/StaplerResponseWrapper.java
index 3decfdba4f..e7407a1cce 100644
--- a/core/src/main/java/org/kohsuke/stapler/StaplerResponseWrapper.java
+++ b/core/src/main/java/org/kohsuke/stapler/StaplerResponseWrapper.java
@@ -1,6 +1,10 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -9,10 +13,6 @@
 import java.net.URL;
 import java.util.Collection;
 import java.util.Locale;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
 import net.sf.json.JsonConfig;
 import org.kohsuke.stapler.export.ExportConfig;
 import org.kohsuke.stapler.export.Flavor;
diff --git a/core/src/main/java/org/kohsuke/stapler/StaticViewFacet.java b/core/src/main/java/org/kohsuke/stapler/StaticViewFacet.java
index dd1127af61..76f331e365 100644
--- a/core/src/main/java/org/kohsuke/stapler/StaticViewFacet.java
+++ b/core/src/main/java/org/kohsuke/stapler/StaticViewFacet.java
@@ -1,17 +1,17 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.stapler.lang.Klass;
 
 /**
diff --git a/core/src/main/java/org/kohsuke/stapler/WebApp.java b/core/src/main/java/org/kohsuke/stapler/WebApp.java
index c9addde575..d5498aec23 100644
--- a/core/src/main/java/org/kohsuke/stapler/WebApp.java
+++ b/core/src/main/java/org/kohsuke/stapler/WebApp.java
@@ -23,6 +23,9 @@
 
 package org.kohsuke.stapler;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
@@ -31,9 +34,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
-import javax.servlet.Filter;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.bind.BoundObjectTable;
 import org.kohsuke.stapler.event.FilteredDispatchTriggerListener;
@@ -74,10 +74,24 @@ public static WebApp get(ServletContext context) {
         return (WebApp)o;
     }
 
+    /**
+     * @deprecated use {@link #get(ServletContext)}
+     */
+    @Deprecated
+    public static WebApp get(javax.servlet.ServletContext context) {
+        return get(context.toJakartaServletContext());
+    }
+
+    /**
+     * @deprecated use {@link #getServletContext}
+     */
+    @Deprecated
+    public final javax.servlet.ServletContext context;
+
     /**
      * {@link ServletContext} for this webapp.
      */
-    public final ServletContext context;
+    private final ServletContext servletContext;
 
     /**
      * @deprecated Unused?
@@ -161,7 +175,8 @@ public static WebApp get(ServletContext context) {
     private JsonInErrorMessageSanitizer jsonInErrorMessageSanitizer;
 
     public WebApp(ServletContext context) {
-        this.context = context;
+        this.servletContext = context;
+        this.context = javax.servlet.ServletContext.fromJakartServletContext(context);
         // TODO: allow classloader to be given?
         facets.addAll(Facet.discoverExtensions(Facet.class, Thread.currentThread().getContextClassLoader(), getClass().getClassLoader()));
         responseRenderers.add(new HttpResponseRenderer.Default());
@@ -172,11 +187,15 @@ public WebApp(ServletContext context) {
      * sits at the root of the URL hierarchy and handles the request to '/'.
      */
     public Object getApp() {
-        return context.getAttribute("app");
+        return servletContext.getAttribute("app");
     }
 
     public void setApp(Object app) {
-        context.setAttribute("app",app);
+        servletContext.setAttribute("app",app);
+    }
+
+    public ServletContext getServletContext() {
+        return servletContext;
     }
 
     public CrumbIssuer getCrumbIssuer() {
diff --git a/core/src/main/java/org/kohsuke/stapler/bind/BoundObjectTable.java b/core/src/main/java/org/kohsuke/stapler/bind/BoundObjectTable.java
index 2798e937df..c3e1239692 100644
--- a/core/src/main/java/org/kohsuke/stapler/bind/BoundObjectTable.java
+++ b/core/src/main/java/org/kohsuke/stapler/bind/BoundObjectTable.java
@@ -24,6 +24,8 @@
 package org.kohsuke.stapler.bind;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Serializable;
@@ -34,8 +36,6 @@
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.Ancestor;
 import org.kohsuke.stapler.HttpResponse;
diff --git a/core/src/main/java/org/kohsuke/stapler/compression/CompressionFilter.java b/core/src/main/java/org/kohsuke/stapler/compression/CompressionFilter.java
index 84248224e0..64f0ae1f0a 100644
--- a/core/src/main/java/org/kohsuke/stapler/compression/CompressionFilter.java
+++ b/core/src/main/java/org/kohsuke/stapler/compression/CompressionFilter.java
@@ -1,16 +1,16 @@
 package org.kohsuke.stapler.compression;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.kohsuke.stapler.CompatibleFilter;
 
 /**
  * Pimps up {@link HttpServletResponse} so that it understands "Content-Encoding: gzip" and compress the response.
@@ -33,7 +33,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-public class CompressionFilter implements Filter {
+public class CompressionFilter implements CompatibleFilter {
     private ServletContext context;
 
     @Override
diff --git a/core/src/main/java/org/kohsuke/stapler/compression/CompressionServletResponse.java b/core/src/main/java/org/kohsuke/stapler/compression/CompressionServletResponse.java
index f6d3a74bbe..288353427c 100644
--- a/core/src/main/java/org/kohsuke/stapler/compression/CompressionServletResponse.java
+++ b/core/src/main/java/org/kohsuke/stapler/compression/CompressionServletResponse.java
@@ -1,12 +1,12 @@
 package org.kohsuke.stapler.compression;
 
 import com.jcraft.jzlib.GZIPOutputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
 
 /**
  * {@link HttpServletResponse} that recognizes Content-Encoding: gzip in the response header
diff --git a/core/src/main/java/org/kohsuke/stapler/compression/FilterServletOutputStream.java b/core/src/main/java/org/kohsuke/stapler/compression/FilterServletOutputStream.java
index ed29568195..3f9f67862f 100644
--- a/core/src/main/java/org/kohsuke/stapler/compression/FilterServletOutputStream.java
+++ b/core/src/main/java/org/kohsuke/stapler/compression/FilterServletOutputStream.java
@@ -1,10 +1,10 @@
 package org.kohsuke.stapler.compression;
 
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
 
 /**
  * {@link ServletOutputStream} that writes to the specified output stream.
diff --git a/core/src/main/java/org/kohsuke/stapler/compression/UncaughtExceptionHandler.java b/core/src/main/java/org/kohsuke/stapler/compression/UncaughtExceptionHandler.java
index bd8b080832..caa51d275c 100644
--- a/core/src/main/java/org/kohsuke/stapler/compression/UncaughtExceptionHandler.java
+++ b/core/src/main/java/org/kohsuke/stapler/compression/UncaughtExceptionHandler.java
@@ -1,15 +1,15 @@
 package org.kohsuke.stapler.compression;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.text.MessageFormat;
 import java.util.Date;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.stapler.Stapler;
 
 /**
diff --git a/core/src/main/java/org/kohsuke/stapler/framework/AbstractWebAppMain.java b/core/src/main/java/org/kohsuke/stapler/framework/AbstractWebAppMain.java
index dabc545069..9c41e59e7a 100644
--- a/core/src/main/java/org/kohsuke/stapler/framework/AbstractWebAppMain.java
+++ b/core/src/main/java/org/kohsuke/stapler/framework/AbstractWebAppMain.java
@@ -24,6 +24,9 @@
 package org.kohsuke.stapler.framework;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -32,9 +35,6 @@
 import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
 import org.jvnet.localizer.LocaleProvider;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
diff --git a/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java b/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java
index af82aab971..1bdecbf5c1 100644
--- a/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java
+++ b/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java
@@ -26,6 +26,7 @@
 package org.kohsuke.stapler.framework.io;
 
 import com.jcraft.jzlib.GZIPInputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.Closeable;
 import java.io.DataInputStream;
 import java.io.EOFException;
@@ -40,7 +41,6 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.output.CountingOutputStream;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
diff --git a/core/src/main/java/org/kohsuke/stapler/interceptor/Interceptor.java b/core/src/main/java/org/kohsuke/stapler/interceptor/Interceptor.java
index 0345dd8284..de6ed7ca89 100644
--- a/core/src/main/java/org/kohsuke/stapler/interceptor/Interceptor.java
+++ b/core/src/main/java/org/kohsuke/stapler/interceptor/Interceptor.java
@@ -1,7 +1,7 @@
 package org.kohsuke.stapler.interceptor;
 
+import jakarta.servlet.ServletException;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.CancelRequestHandlingException;
 import org.kohsuke.stapler.Function;
 import org.kohsuke.stapler.HttpResponses;
diff --git a/core/src/main/java/org/kohsuke/stapler/interceptor/JsonOutputFilter.java b/core/src/main/java/org/kohsuke/stapler/interceptor/JsonOutputFilter.java
index ec9f153d40..c3834e3beb 100644
--- a/core/src/main/java/org/kohsuke/stapler/interceptor/JsonOutputFilter.java
+++ b/core/src/main/java/org/kohsuke/stapler/interceptor/JsonOutputFilter.java
@@ -22,6 +22,7 @@
  */
 package org.kohsuke.stapler.interceptor;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -30,7 +31,6 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import javax.servlet.ServletException;
 import net.sf.json.JsonConfig;
 import net.sf.json.util.PropertyFilter;
 import org.kohsuke.stapler.StaplerRequest;
diff --git a/core/src/main/java/org/kohsuke/stapler/interceptor/RequirePOST.java b/core/src/main/java/org/kohsuke/stapler/interceptor/RequirePOST.java
index 3664ad0558..5914fa4054 100644
--- a/core/src/main/java/org/kohsuke/stapler/interceptor/RequirePOST.java
+++ b/core/src/main/java/org/kohsuke/stapler/interceptor/RequirePOST.java
@@ -1,6 +1,8 @@
 package org.kohsuke.stapler.interceptor;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.annotation.ElementType;
@@ -9,8 +11,6 @@
 import java.lang.annotation.Target;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ServiceLoader;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.stapler.ForwardToView;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.StaplerRequest;
diff --git a/core/src/main/java/org/kohsuke/stapler/interceptor/RespondSuccess.java b/core/src/main/java/org/kohsuke/stapler/interceptor/RespondSuccess.java
index 933df18101..51db7eb2b6 100644
--- a/core/src/main/java/org/kohsuke/stapler/interceptor/RespondSuccess.java
+++ b/core/src/main/java/org/kohsuke/stapler/interceptor/RespondSuccess.java
@@ -1,11 +1,11 @@
 package org.kohsuke.stapler.interceptor;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
diff --git a/core/src/main/java/org/kohsuke/stapler/json/JsonBody.java b/core/src/main/java/org/kohsuke/stapler/json/JsonBody.java
index cbf94d84b7..aeefa06886 100644
--- a/core/src/main/java/org/kohsuke/stapler/json/JsonBody.java
+++ b/core/src/main/java/org/kohsuke/stapler/json/JsonBody.java
@@ -1,5 +1,6 @@
 package org.kohsuke.stapler.json;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
@@ -7,7 +8,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.stapler.AnnotationHandler;
diff --git a/core/src/main/java/org/kohsuke/stapler/json/JsonHttpResponse.java b/core/src/main/java/org/kohsuke/stapler/json/JsonHttpResponse.java
index 42ee7e03db..87b3b5840b 100644
--- a/core/src/main/java/org/kohsuke/stapler/json/JsonHttpResponse.java
+++ b/core/src/main/java/org/kohsuke/stapler/json/JsonHttpResponse.java
@@ -2,11 +2,11 @@
 
 import edu.umd.cs.findbugs.annotations.Nullable;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
-import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.HttpResponses.HttpResponseException;
 import org.kohsuke.stapler.StaplerRequest;
diff --git a/core/src/main/java/org/kohsuke/stapler/json/JsonResponse.java b/core/src/main/java/org/kohsuke/stapler/json/JsonResponse.java
index 3649272880..f9bbbf6155 100644
--- a/core/src/main/java/org/kohsuke/stapler/json/JsonResponse.java
+++ b/core/src/main/java/org/kohsuke/stapler/json/JsonResponse.java
@@ -1,5 +1,6 @@
 package org.kohsuke.stapler.json;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +9,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
diff --git a/core/src/main/java/org/kohsuke/stapler/json/SubmittedForm.java b/core/src/main/java/org/kohsuke/stapler/json/SubmittedForm.java
index d7cfe49546..ade2101757 100644
--- a/core/src/main/java/org/kohsuke/stapler/json/SubmittedForm.java
+++ b/core/src/main/java/org/kohsuke/stapler/json/SubmittedForm.java
@@ -1,12 +1,12 @@
 package org.kohsuke.stapler.json;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.servlet.ServletException;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.AnnotationHandler;
 import org.kohsuke.stapler.InjectedParameter;
diff --git a/core/src/main/java/org/kohsuke/stapler/verb/HttpVerbInterceptor.java b/core/src/main/java/org/kohsuke/stapler/verb/HttpVerbInterceptor.java
index 4456e60ac9..589f54ae19 100644
--- a/core/src/main/java/org/kohsuke/stapler/verb/HttpVerbInterceptor.java
+++ b/core/src/main/java/org/kohsuke/stapler/verb/HttpVerbInterceptor.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler.verb;
 
+import jakarta.servlet.ServletException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.CancelRequestHandlingException;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
diff --git a/core/src/main/resources/javax/servlet/LocalStrings.properties b/core/src/main/resources/javax/servlet/LocalStrings.properties
new file mode 100644
index 0000000000..7a478e0d20
--- /dev/null
+++ b/core/src/main/resources/javax/servlet/LocalStrings.properties
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Default localized string information
+# Localized for Locale en_US
+
+err.not_iso8859_1=Not an ISO 8859-1 character: {0}
+err.servlet_config_not_initialized=ServletConfig has not been initialized
+value.true=true
+value.false=false
diff --git a/core/src/main/resources/javax/servlet/LocalStrings_fr.properties b/core/src/main/resources/javax/servlet/LocalStrings_fr.properties
new file mode 100644
index 0000000000..af9a2f0752
--- /dev/null
+++ b/core/src/main/resources/javax/servlet/LocalStrings_fr.properties
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Default localized string information
+# Localized for Locale fr_FR
+
+err.not_iso8859_1={0} n''est pas un caractère ISO 8859-1
+value.true=true
+value.false=false 
+
+
diff --git a/core/src/main/resources/javax/servlet/LocalStrings_ja.properties b/core/src/main/resources/javax/servlet/LocalStrings_ja.properties
new file mode 100644
index 0000000000..7d55785472
--- /dev/null
+++ b/core/src/main/resources/javax/servlet/LocalStrings_ja.properties
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Default localized string information
+# Localized for Locale ja_JP
+
+err.not_iso8859_1=ISO 8859-1 \u306e\u6587\u5b57\u3067\u306f\u3042\u308a\u307e\u305b\u3093: {0}
+value.true=true
+value.false=false
diff --git a/core/src/main/resources/javax/servlet/http/LocalStrings.properties b/core/src/main/resources/javax/servlet/http/LocalStrings.properties
new file mode 100644
index 0000000000..959355f513
--- /dev/null
+++ b/core/src/main/resources/javax/servlet/http/LocalStrings.properties
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Default localized string information
+# Localized for Locale en_US
+
+err.cookie_name_is_token=Cookie name \"{0}\" is a reserved token
+err.cookie_name_blank=Cookie name must not be null or empty
+err.io.nullArray=Null passed for byte array in write method
+err.io.indexOutOfBounds=Invalid offset [{0}] and / or length [{1}] specified for array of size [{2}]
+err.io.short_read=Short Read
+err.ise.getWriter=Illegal to call getWriter() after getOutputStream() has been called
+err.ise.getOutputStream=Illegal to call getOutputStream() after getWriter() has been called
+
+http.method_not_implemented=Method {0} is not defined in RFC 2068 and is not supported 
+
+http.method_get_not_supported=HTTP method GET is not supported by this URL
+http.method_post_not_supported=HTTP method POST is not supported by this URL
+http.method_put_not_supported=HTTP method PUT is not supported by this URL
+http.method_delete_not_supported=Http method DELETE is not supported by this URL
diff --git a/core/src/main/resources/javax/servlet/http/LocalStrings_es.properties b/core/src/main/resources/javax/servlet/http/LocalStrings_es.properties
new file mode 100644
index 0000000000..65367d98c7
--- /dev/null
+++ b/core/src/main/resources/javax/servlet/http/LocalStrings_es.properties
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# $Id: LocalStrings_es.properties,v 1.1.1.1 2003/01/27 16:07:47 ja120174 Exp $
+#
+# Default localized string information
+# Localized para Locale es_ES
+
+err.cookie_name_is_token=El Nombre de Cookie {0} es una palabra reservada
+err.io.negativelength=Longitud Negativa en el metodo write
+err.io.short_read=Lectura Corta
+
+http.method_not_implemented=El Metodo {0} no esta definido en la especificacion RFC 2068 y no es soportado por la API Servlet 
+
+http.method_get_not_supported=El Metodo HTTP GET no es soportado por esta URL
+http.method_post_not_supported=El Metodo HTTP POST no es soportado por esta URL
+http.method_put_not_supported=El Metodo HTTP PUT no es soportado por esta URL
+http.method_delete_not_supported=El Metodo HTTP DELETE no es soportado por esta URL
diff --git a/core/src/main/resources/javax/servlet/http/LocalStrings_fr.properties b/core/src/main/resources/javax/servlet/http/LocalStrings_fr.properties
new file mode 100644
index 0000000000..0c3f5d603e
--- /dev/null
+++ b/core/src/main/resources/javax/servlet/http/LocalStrings_fr.properties
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Default localized string information
+# Localized for Locale fr_FR
+
+err.cookie_name_is_token=Le nom de cookie \"{0}\" est un \"token\" réservé
+err.io.negativelength=Taille négative donnée dans la méthode \"write\"
+err.io.short_read=Lecture partielle
+
+http.method_not_implemented=Le méthode {0} n''est pas définie dans la RFC 2068 et n''est pas supportée par l''API Servlet
+
+http.method_get_not_supported=La méthode HTTP GET n''est pas supportée par cette URL
+http.method_post_not_supported=La méthode HTTP POST n''est pas supportée par cette URL
+http.method_put_not_supported=La méthode HTTP PUT n''est pas supportée par cette URL
+http.method_delete_not_supported=La méthode HTTP DELETE n''est pas supportée par cette URL 
diff --git a/core/src/main/resources/javax/servlet/http/LocalStrings_ja.properties b/core/src/main/resources/javax/servlet/http/LocalStrings_ja.properties
new file mode 100644
index 0000000000..eec21481a6
--- /dev/null
+++ b/core/src/main/resources/javax/servlet/http/LocalStrings_ja.properties
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Default localized string information
+# Localized for Locale ja_JP
+
+err.cookie_name_is_token=\u30af\u30c3\u30ad\u30fc\u540d \"{0}\" \u306f\u4e88\u7d04\u6e08\u306e\u30c8\u30fc\u30af\u30f3\u3067\u3059\u3002
+err.io.negativelength=write\u30e1\u30bd\u30c3\u30c9\u306b\u8ca0\u306e\u9577\u3055\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f\u3002
+err.io.short_read=\u8aad\u307f\u8fbc\u307f\u304c\u3059\u3050\u306b\u7d42\u308f\u308a\u307e\u3057\u305f\u3002
+
+http.method_not_implemented=\u30e1\u30bd\u30c3\u30c9 {0} \u306fRFC 2068\u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u304a\u3089\u305a\u3001\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8API\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093\u3002
+
+http.method_get_not_supported=HTTP\u306eGET\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+http.method_post_not_supported=HTTP\u306ePOST\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+http.method_put_not_supported=HTTP\u306ePUT\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+http.method_delete_not_supported=HTTP\u306eDELETE\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u3053\u306eURL\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
diff --git a/core/src/test/java/org/kohsuke/stapler/AbstractStaplerTestBase.java b/core/src/test/java/org/kohsuke/stapler/AbstractStaplerTestBase.java
index 9cd38f9c6d..3fe85b34e0 100644
--- a/core/src/test/java/org/kohsuke/stapler/AbstractStaplerTestBase.java
+++ b/core/src/test/java/org/kohsuke/stapler/AbstractStaplerTestBase.java
@@ -1,10 +1,10 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import junit.framework.TestCase;
 import org.kohsuke.stapler.test.AbstractStaplerTest;
 import org.mockito.Mockito;
diff --git a/core/src/test/java/org/kohsuke/stapler/ClassDescriptorTest.java b/core/src/test/java/org/kohsuke/stapler/ClassDescriptorTest.java
index 4ef5d0bc51..2d96be97b3 100644
--- a/core/src/test/java/org/kohsuke/stapler/ClassDescriptorTest.java
+++ b/core/src/test/java/org/kohsuke/stapler/ClassDescriptorTest.java
@@ -5,6 +5,7 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.fail;
 
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -12,7 +13,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletException;
 import org.junit.Test;
 
 /**
diff --git a/core/src/test/java/org/kohsuke/stapler/DispatcherTest.java b/core/src/test/java/org/kohsuke/stapler/DispatcherTest.java
index 2736da47be..7d8705a5d9 100644
--- a/core/src/test/java/org/kohsuke/stapler/DispatcherTest.java
+++ b/core/src/test/java/org/kohsuke/stapler/DispatcherTest.java
@@ -1,9 +1,9 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.IOUtils;
 import org.htmlunit.FailingHttpStatusCodeException;
 import org.htmlunit.HttpMethod;
diff --git a/core/src/test/java/org/kohsuke/stapler/IndexHtmlDispatcherTest.java b/core/src/test/java/org/kohsuke/stapler/IndexHtmlDispatcherTest.java
index f19e71a6f9..a2d2592e1d 100644
--- a/core/src/test/java/org/kohsuke/stapler/IndexHtmlDispatcherTest.java
+++ b/core/src/test/java/org/kohsuke/stapler/IndexHtmlDispatcherTest.java
@@ -5,8 +5,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import jakarta.servlet.ServletContext;
 import java.net.MalformedURLException;
-import javax.servlet.ServletContext;
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 
diff --git a/core/src/test/java/org/kohsuke/stapler/MockRequest.java b/core/src/test/java/org/kohsuke/stapler/MockRequest.java
index 764852f44e..c64f78241f 100644
--- a/core/src/test/java/org/kohsuke/stapler/MockRequest.java
+++ b/core/src/test/java/org/kohsuke/stapler/MockRequest.java
@@ -1,5 +1,19 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -9,20 +23,6 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
 
 /**
  * @author Kohsuke Kawaguchi
diff --git a/core/src/test/java/org/kohsuke/stapler/MockServletContext.java b/core/src/test/java/org/kohsuke/stapler/MockServletContext.java
index a66f82e079..af48188f94 100644
--- a/core/src/test/java/org/kohsuke/stapler/MockServletContext.java
+++ b/core/src/test/java/org/kohsuke/stapler/MockServletContext.java
@@ -1,5 +1,16 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletRegistration.Dynamic;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -7,17 +18,6 @@
 import java.util.EventListener;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.ServletRegistration.Dynamic;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -195,17 +195,17 @@ public ServletRegistration getServletRegistration(String servletName) {
     }
 
     @Override
-    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
+    public jakarta.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
         return null;
     }
 
     @Override
-    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
+    public jakarta.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
         return null;
     }
 
     @Override
-    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
+    public jakarta.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
         // TODO Auto-generated method stub
         return null;
     }
diff --git a/core/src/test/java/org/kohsuke/stapler/NestedJsonTest.java b/core/src/test/java/org/kohsuke/stapler/NestedJsonTest.java
index 730d7509bd..4b58b8db41 100644
--- a/core/src/test/java/org/kohsuke/stapler/NestedJsonTest.java
+++ b/core/src/test/java/org/kohsuke/stapler/NestedJsonTest.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletException;
 import java.util.Collections;
 import java.util.List;
-import javax.servlet.ServletException;
 import junit.framework.TestCase;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
diff --git a/core/src/test/java/org/kohsuke/stapler/RequestImplTest.java b/core/src/test/java/org/kohsuke/stapler/RequestImplTest.java
index 2751eeb9eb..10f772fb75 100644
--- a/core/src/test/java/org/kohsuke/stapler/RequestImplTest.java
+++ b/core/src/test/java/org/kohsuke/stapler/RequestImplTest.java
@@ -24,6 +24,11 @@
  */
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -33,13 +38,8 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 import net.sf.json.JSONObject;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.junit.Assert;
diff --git a/core/src/test/java/org/kohsuke/stapler/ResponseImplTest.java b/core/src/test/java/org/kohsuke/stapler/ResponseImplTest.java
index 6a8272d52d..622326acc3 100644
--- a/core/src/test/java/org/kohsuke/stapler/ResponseImplTest.java
+++ b/core/src/test/java/org/kohsuke/stapler/ResponseImplTest.java
@@ -3,10 +3,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.stapler.test.AbstractStaplerTest;
 
 /**
diff --git a/core/src/test/java/org/kohsuke/stapler/ServletConfigImpl.java b/core/src/test/java/org/kohsuke/stapler/ServletConfigImpl.java
index 6c1f4b9f20..d951a32265 100644
--- a/core/src/test/java/org/kohsuke/stapler/ServletConfigImpl.java
+++ b/core/src/test/java/org/kohsuke/stapler/ServletConfigImpl.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
 import java.util.Enumeration;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
 
 /**
  * @author Kohsuke Kawaguchi
diff --git a/core/src/test/java/org/kohsuke/stapler/Stapler2Test.java b/core/src/test/java/org/kohsuke/stapler/Stapler2Test.java
index 301d57ded0..ae2e4ee711 100644
--- a/core/src/test/java/org/kohsuke/stapler/Stapler2Test.java
+++ b/core/src/test/java/org/kohsuke/stapler/Stapler2Test.java
@@ -28,8 +28,8 @@
 
 import static org.junit.Assert.assertThrows;
 
+import jakarta.servlet.http.HttpServletResponse;
 import java.net.URL;
-import javax.servlet.http.HttpServletResponse;
 import org.htmlunit.FailingHttpStatusCodeException;
 import org.htmlunit.WebClient;
 import org.jvnet.hudson.test.For;
diff --git a/core/src/test/java/org/kohsuke/stapler/compression/CompressionFilterTest.java b/core/src/test/java/org/kohsuke/stapler/compression/CompressionFilterTest.java
index b61564ab88..8f483e347b 100644
--- a/core/src/test/java/org/kohsuke/stapler/compression/CompressionFilterTest.java
+++ b/core/src/test/java/org/kohsuke/stapler/compression/CompressionFilterTest.java
@@ -1,5 +1,6 @@
 package org.kohsuke.stapler.compression;
 
+import jakarta.servlet.DispatcherType;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -10,9 +11,8 @@
 import java.util.EnumSet;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
-import javax.servlet.DispatcherType;
 import org.apache.commons.io.IOUtils;
-import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.test.JettyTestCase;
diff --git a/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java b/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
index 874003d381..5ce02a6e19 100644
--- a/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
+++ b/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
@@ -1,20 +1,20 @@
 package org.kohsuke.stapler.test;
 
+import jakarta.servlet.ServletContext;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.Charset;
-import javax.servlet.ServletContext;
 import junit.framework.TestCase;
+import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee9.servlet.ServletHolder;
+import org.eclipse.jetty.ee9.webapp.WebAppContext;
 import org.eclipse.jetty.http.UriCompliance;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.webapp.WebAppContext;
 import org.htmlunit.WebClient;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.WebApp;
diff --git a/docs/getting-started.adoc b/docs/getting-started.adoc
index 9b68f37e05..d40f3c2e09 100644
--- a/docs/getting-started.adoc
+++ b/docs/getting-started.adoc
@@ -29,7 +29,7 @@ Stapler needs to know the root object of your application. It does that
 by `ServletContext.getAttribute("app")`, so your application needs to
 set the root object into a ServletContext. The easiest to do that is to
 write a
-http://java.sun.com/j2ee/1.4/docs/api/javax/servlet/ServletContextListener.html[`ServletContextListener`]
+https://jakarta.ee/specifications/servlet/5.0/apidocs/jakarta/servlet/ServletContextListener.html[`ServletContextListener`]
 and use the helper method from `Stapler`.
 
 Specifically, you write the following class:
diff --git a/groovy/pom.xml b/groovy/pom.xml
index 2a11b11985..521dafffa6 100644
--- a/groovy/pom.xml
+++ b/groovy/pom.xml
@@ -30,7 +30,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>
diff --git a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyClassTearOff.java b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyClassTearOff.java
index f39d5fc26e..d2dc4efaff 100644
--- a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyClassTearOff.java
+++ b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyClassTearOff.java
@@ -23,9 +23,9 @@
 
 package org.kohsuke.stapler.jelly.groovy;
 
+import jakarta.servlet.RequestDispatcher;
 import java.io.IOException;
 import java.net.URL;
-import javax.servlet.RequestDispatcher;
 import org.apache.commons.jelly.Script;
 import org.kohsuke.stapler.AbstractTearOff;
 import org.kohsuke.stapler.MetaClass;
diff --git a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyFacet.java b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyFacet.java
index 9432f7e743..cdc3d0c8a3 100644
--- a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyFacet.java
+++ b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyFacet.java
@@ -23,13 +23,13 @@
 
 package org.kohsuke.stapler.jelly.groovy;
 
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
 import org.apache.commons.jelly.JellyException;
 import org.kohsuke.MetaInfServices;
 import org.kohsuke.stapler.Dispatcher;
diff --git a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyServerPageTearOff.java b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyServerPageTearOff.java
index 540a31209f..39dbeb497a 100644
--- a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyServerPageTearOff.java
+++ b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyServerPageTearOff.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler.jelly.groovy;
 
+import jakarta.servlet.RequestDispatcher;
 import java.io.IOException;
 import java.net.URL;
-import javax.servlet.RequestDispatcher;
 import org.kohsuke.stapler.AbstractTearOff;
 import org.kohsuke.stapler.MetaClass;
 import org.kohsuke.stapler.jelly.JellyRequestDispatcher;
diff --git a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java
index e9f187b37c..8f23b855ba 100644
--- a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java
+++ b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java
@@ -29,13 +29,13 @@
 import groovy.lang.MissingMethodException;
 import groovy.lang.MissingPropertyException;
 import groovy.xml.QName;
+import jakarta.servlet.ServletContext;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.servlet.ServletContext;
 import org.apache.commons.beanutils.ConvertingWrapDynaBean;
 import org.apache.commons.beanutils.DynaBean;
 import org.apache.commons.beanutils.DynaProperty;
diff --git a/jelly/pom.xml b/jelly/pom.xml
index a7bcb2ffa5..a4f4d97deb 100644
--- a/jelly/pom.xml
+++ b/jelly/pom.xml
@@ -12,7 +12,8 @@
   <description>Jelly binding for Stapler</description>
 
   <properties>
-    <jelly.version>1.1-jenkins-20240510</jelly.version>
+    <!-- TODO https://ci.jenkins.io/job/jenkinsci-libraries/job/jelly/job/jakarta/ -->
+    <jelly.version>1.1-jenkins-20240511-rc190.1f3a_71a_da_db_2</jelly.version>
     <jellydoc-maven-plugin.version>137.v803fea_a_fb_c75</jellydoc-maven-plugin.version>
   </properties>
 
@@ -48,7 +49,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>
 
@@ -67,17 +68,17 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <artifactId>jetty-util</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-servlet</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee9</groupId>
+      <artifactId>jetty-ee9-webapp</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctManager.java b/jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctManager.java
index aa97e0cb47..3e7796c7e4 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctManager.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctManager.java
@@ -23,13 +23,13 @@
 
 package org.kohsuke.stapler.framework.adjunct;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URL;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.MetaClass;
 import org.kohsuke.stapler.StaplerRequest;
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/AbstractStaplerTag.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/AbstractStaplerTag.java
index 919a00f1aa..340c597eb3 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/AbstractStaplerTag.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/AbstractStaplerTag.java
@@ -23,9 +23,9 @@
 
 package org.kohsuke.stapler.jelly;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.jelly.TagSupport;
 
 /**
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/ContentTypeTag.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/ContentTypeTag.java
index f75cbc6a0b..0c7c6ae3f7 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/ContentTypeTag.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/ContentTypeTag.java
@@ -23,7 +23,7 @@
 
 package org.kohsuke.stapler.jelly;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.jelly.JellyTagException;
 import org.apache.commons.jelly.MissingAttributeException;
 import org.apache.commons.jelly.XMLOutput;
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/DefaultScriptInvoker.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/DefaultScriptInvoker.java
index 76f8c19a7d..0ce441455a 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/DefaultScriptInvoker.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/DefaultScriptInvoker.java
@@ -25,12 +25,12 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.ServletContext;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.util.Enumeration;
-import javax.servlet.ServletContext;
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.JellyTagException;
 import org.apache.commons.jelly.Script;
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/IsUserInRoleTag.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/IsUserInRoleTag.java
index 83def59af5..65b7bd1ad8 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/IsUserInRoleTag.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/IsUserInRoleTag.java
@@ -23,7 +23,7 @@
 
 package org.kohsuke.stapler.jelly;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.jelly.JellyTagException;
 import org.apache.commons.jelly.MissingAttributeException;
 import org.apache.commons.jelly.XMLOutput;
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyClassTearOff.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyClassTearOff.java
index 11f42edf4d..0f5fadc96e 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyClassTearOff.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyClassTearOff.java
@@ -23,11 +23,11 @@
 
 package org.kohsuke.stapler.jelly;
 
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.net.URL;
 import java.util.logging.Logger;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
 import org.apache.commons.jelly.JellyException;
 import org.apache.commons.jelly.Script;
 import org.kohsuke.stapler.AbstractTearOff;
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyFacet.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyFacet.java
index a4610e1001..53cafa4a6f 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyFacet.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyFacet.java
@@ -25,15 +25,15 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
 import org.apache.commons.jelly.JellyException;
 import org.apache.commons.jelly.expression.ExpressionFactory;
 import org.kohsuke.MetaInfServices;
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyRequestDispatcher.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyRequestDispatcher.java
index 61c64c368c..9d0a83a6c7 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyRequestDispatcher.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/JellyRequestDispatcher.java
@@ -24,11 +24,11 @@
 package org.kohsuke.stapler.jelly;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import org.apache.commons.jelly.JellyTagException;
 import org.apache.commons.jelly.Script;
 import org.kohsuke.stapler.StaplerRequest;
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/StaplerTagLibrary.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/StaplerTagLibrary.java
index 3de84e961c..5da6953368 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/StaplerTagLibrary.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/StaplerTagLibrary.java
@@ -24,9 +24,9 @@
 package org.kohsuke.stapler.jelly;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.HashSet;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.JellyException;
 import org.apache.commons.jelly.JellyTagException;
diff --git a/jelly/src/test/java/org/kohsuke/stapler/jelly/issue76/ProtectedClass.java b/jelly/src/test/java/org/kohsuke/stapler/jelly/issue76/ProtectedClass.java
index 1fe3d0ab2d..9de40c241e 100644
--- a/jelly/src/test/java/org/kohsuke/stapler/jelly/issue76/ProtectedClass.java
+++ b/jelly/src/test/java/org/kohsuke/stapler/jelly/issue76/ProtectedClass.java
@@ -1,10 +1,10 @@
 package org.kohsuke.stapler.jelly.issue76;
 
+import jakarta.servlet.ServletException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.ServletException;
 import org.kohsuke.stapler.ForwardingFunction;
 import org.kohsuke.stapler.Function;
 import org.kohsuke.stapler.FunctionList;
diff --git a/jrebel/pom.xml b/jrebel/pom.xml
index 84753c0225..434e3e92eb 100644
--- a/jrebel/pom.xml
+++ b/jrebel/pom.xml
@@ -25,7 +25,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>
diff --git a/jrebel/src/main/java/org/kohsuke/stapler/JRebelFacet.java b/jrebel/src/main/java/org/kohsuke/stapler/JRebelFacet.java
index a38dc69353..04cf16b10b 100644
--- a/jrebel/src/main/java/org/kohsuke/stapler/JRebelFacet.java
+++ b/jrebel/src/main/java/org/kohsuke/stapler/JRebelFacet.java
@@ -1,12 +1,12 @@
 package org.kohsuke.stapler;
 
+import jakarta.servlet.RequestDispatcher;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.RequestDispatcher;
 import org.kohsuke.MetaInfServices;
 import org.kohsuke.stapler.export.ModelBuilder;
 import org.kohsuke.stapler.lang.Klass;
diff --git a/jsp/pom.xml b/jsp/pom.xml
index d147146549..f98be563af 100644
--- a/jsp/pom.xml
+++ b/jsp/pom.xml
@@ -25,13 +25,13 @@
     <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>
       <groupId>jakarta.servlet.jsp</groupId>
       <artifactId>jakarta.servlet.jsp-api</artifactId>
-      <version>2.3.6</version>
+      <version>3.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/jsp/src/main/java/org/kohsuke/stapler/jsp/JSPFacet.java b/jsp/src/main/java/org/kohsuke/stapler/jsp/JSPFacet.java
index c147e8e213..6fac668b05 100644
--- a/jsp/src/main/java/org/kohsuke/stapler/jsp/JSPFacet.java
+++ b/jsp/src/main/java/org/kohsuke/stapler/jsp/JSPFacet.java
@@ -23,12 +23,12 @@
 
 package org.kohsuke.stapler.jsp;
 
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.List;
 import java.util.logging.Level;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 import org.kohsuke.MetaInfServices;
 import org.kohsuke.stapler.Dispatcher;
 import org.kohsuke.stapler.Facet;
diff --git a/jsp/src/main/java/org/kohsuke/stapler/jsp/RequestDispatcherWrapper.java b/jsp/src/main/java/org/kohsuke/stapler/jsp/RequestDispatcherWrapper.java
index b5676f342a..ce437daac4 100644
--- a/jsp/src/main/java/org/kohsuke/stapler/jsp/RequestDispatcherWrapper.java
+++ b/jsp/src/main/java/org/kohsuke/stapler/jsp/RequestDispatcherWrapper.java
@@ -24,11 +24,11 @@
 package org.kohsuke.stapler.jsp;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import java.io.IOException;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 
 /**
  * {@link RequestDispatcher} that sets "it" before the invocation.
diff --git a/jsp/src/main/java/org/kohsuke/stapler/tags/Include.java b/jsp/src/main/java/org/kohsuke/stapler/tags/Include.java
index 1ad6a4955f..a90a04d656 100644
--- a/jsp/src/main/java/org/kohsuke/stapler/tags/Include.java
+++ b/jsp/src/main/java/org/kohsuke/stapler/tags/Include.java
@@ -24,18 +24,18 @@
 package org.kohsuke.stapler.tags;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.SimpleTagSupport;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
 
 /**
  * Includes a side JSP file for the "it" object.
diff --git a/pom.xml b/pom.xml
index 6387bd6f73..0339c502b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,10 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <scmTag>HEAD</scmTag>
-    <jetty.version>10.0.20</jetty.version>
+    <jetty.version>12.0.9</jetty.version>
     <gitHubRepo>jenkinsci/stapler</gitHubRepo>
+    <!-- TODO until in parent POM -->
+    <maven.compiler.release>17</maven.compiler.release>
   </properties>
 
   <dependencyManagement>
@@ -57,6 +59,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.ee9</groupId>
+        <artifactId>jetty-ee9-bom</artifactId>
+        <version>${jetty.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>