From 4428ccfe5f6ee9c811cbc1ddfcf301ee5833af87 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sun, 13 Feb 2022 08:32:41 -0800 Subject: [PATCH] Bump Jetty from 9.4.45.v20220203 to 10.0.7 --- Jenkinsfile | 1 - .../test/java/org/kohsuke/stapler/test/JettyTestCase.java | 5 +++++ pom.xml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e2835693f2..3838b09a10 100644 --- 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' ] ]) 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 75e74799d3..1e4dd21803 100644 --- 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 index 96b47eaf3a..1cabc7b169 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 999999-SNAPSHOT HEAD ${project.basedir}/../src/spotbugs/spotbugs-excludes.xml - 9.4.45.v20220203 + 10.0.7