Bump Jetty from 9.4.46.v20220331 to 10.0.9

jenkinsci · Jun 7, 2022 · ad4ac07 · ad4ac07
1 parent c10d073
commit ad4ac07
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,7 +4,6 @@
  * allowing one to test against multiple Jenkins versions.
  */
 buildPlugin(useContainerAgent: true, configurations: [
-  [ platform: 'linux', jdk: '8' ],
   [ platform: 'linux', jdk: '11' ],
   [ platform: 'windows', jdk: '11' ],
   [ platform: 'linux', jdk: '17' ],

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/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.46.v20220331</jetty.version>
+    <jetty.version>10.0.9</jetty.version>
     <gitHubRepo>jenkinsci/stapler</gitHubRepo>
   </properties>