Upgrade Jetty from 9.4.48.v20220622 to 10.0.11 (#305)

jenkinsci · Jun 30, 2022 · 5b1b03f · 5b1b03f
1 parent 4573b15
commit 5b1b03f
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 28 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,8 +15,8 @@ updates:
       # it would be good to update it at some point, but requires significant testing
       - dependency-name: "org.codehaus.groovy:groovy-all"
         versions: [">=2.5.0"]
-      # Must remain within Jetty 9.x until Java 8 support is removed; ignore Jetty 10.x and Jetty 11.x updates
+      # Must remain within Jetty 10.x until the Jakarta migration is complete; ignore Jetty 11.x updates
       - dependency-name: "org.eclipse.jetty:*"
-        versions: [">=10.0.0"]
+        versions: [">=11.0.0"]
       # Provided by the Web container, so aligned with Jetty.
-      - dependency-name: "javax.servlet:javax.servlet-api"
+      - dependency-name: "jakarta.servlet:jakarta.servlet-api"
diff --git a/core/pom.xml b/core/pom.xml
@@ -106,9 +106,9 @@
       <version>9.3</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>4.0.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/core/src/test/java/org/kohsuke/stapler/MockServletContext.java b/core/src/test/java/org/kohsuke/stapler/MockServletContext.java
@@ -46,7 +46,7 @@ public String getMimeType(String file) {
     }
 
     @Override
-    public Set getResourcePaths(String s) {
+    public Set<String> getResourcePaths(String s) {
         return null;
     }
 
@@ -76,12 +76,12 @@ public Servlet getServlet(String name) throws ServletException {
     }
 
     @Override
-    public Enumeration getServlets() {
+    public Enumeration<Servlet> getServlets() {
         return null;
     }
 
     @Override
-    public Enumeration getServletNames() {
+    public Enumeration<String> getServletNames() {
         return null;
     }
 
@@ -113,7 +113,7 @@ public String getInitParameter(String name) {
     }
 
     @Override
-    public Enumeration getInitParameterNames() {
+    public Enumeration<String> getInitParameterNames() {
         return null;
     }
 
@@ -123,7 +123,7 @@ public Object getAttribute(String name) {
     }
 
     @Override
-    public Enumeration getAttributeNames() {
+    public Enumeration<String> getAttributeNames() {
         return null;
     }
 
@@ -175,6 +175,11 @@ public Dynamic addServlet(String servletName, Class<? extends Servlet> servletCl
         return null;
     }
 
+    @Override
+    public Dynamic addJspFile(String servletName, String jspFile) {
+        return null;
+    }
+
     @Override
     public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
         return null;
@@ -275,4 +280,31 @@ public void declareRoles(String... roleNames) {
     public String getVirtualServerName() {
         return null;
     }
+
+    @Override
+    public int getSessionTimeout() {
+        return 0;
+    }
+
+    @Override
+    public void setSessionTimeout(int sessionTimeout) {
+    }
+
+    @Override
+    public String getRequestCharacterEncoding() {
+        return null;
+    }
+
+    @Override
+    public void setRequestCharacterEncoding(String encoding) {
+    }
+
+    @Override
+    public String getResponseCharacterEncoding() {
+        return null;
+    }
+
+    @Override
+    public void setResponseCharacterEncoding(String encoding) {
+    }
 }
diff --git a/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java b/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
@@ -2,6 +2,9 @@
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import junit.framework.TestCase;
+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;
@@ -44,6 +47,8 @@ protected void setUp() throws Exception {
         server.setHandler(context);
 
         ServerConnector connector = new ServerConnector(server);
+        HttpConfiguration hc = connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration();
+        hc.setUriCompliance(UriCompliance.LEGACY);
         server.addConnector(connector);
         server.start();
 

diff --git a/groovy/pom.xml b/groovy/pom.xml
@@ -28,9 +28,9 @@
       <optional>true</optional>
     </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>4.0.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/jelly/pom.xml b/jelly/pom.xml
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>commons-jelly</artifactId>
-      <version>1.1-jenkins-20220625</version>
+      <version>1.1-jenkins-20220630</version>
       <exclusions>
         <exclusion>
           <groupId>dom4j</groupId>
@@ -47,9 +47,9 @@
       <optional>true</optional>
     </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>4.0.4</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/jrebel/pom.xml b/jrebel/pom.xml
@@ -23,9 +23,9 @@
       <optional>true</optional>
     </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>4.0.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/jsp/pom.xml b/jsp/pom.xml
@@ -23,15 +23,15 @@
       <optional>true</optional>
     </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>4.0.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>javax.servlet.jsp-api</artifactId>
-      <version>2.3.3</version>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <version>2.3.6</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
     <changelist>999999-SNAPSHOT</changelist>
     <scmTag>HEAD</scmTag>
     <spotbugs.excludeFilterFile>${project.basedir}/../src/spotbugs/spotbugs-excludes.xml</spotbugs.excludeFilterFile>
-    <jetty.version>9.4.48.v20220622</jetty.version>
+    <jetty.version>10.0.11</jetty.version>
     <gitHubRepo>jenkinsci/stapler</gitHubRepo>
   </properties>