diff --git a/core/pom.xml b/core/pom.xml index 912ec1f1c..97753a1af 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -131,17 +131,17 @@ org.eclipse.jetty - jetty-servlet + jetty-util test - org.eclipse.jetty - jetty-util + org.eclipse.jetty.ee8 + jetty-ee8-servlet test - org.eclipse.jetty - jetty-webapp + org.eclipse.jetty.ee8 + jetty-ee8-webapp test 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 b61564ab8..3054fb606 100644 --- a/core/src/test/java/org/kohsuke/stapler/compression/CompressionFilterTest.java +++ b/core/src/test/java/org/kohsuke/stapler/compression/CompressionFilterTest.java @@ -12,7 +12,7 @@ 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.ee8.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 874003d38..7704bfc4a 100644 --- a/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java +++ b/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java @@ -7,14 +7,14 @@ import java.nio.charset.Charset; import javax.servlet.ServletContext; import junit.framework.TestCase; +import org.eclipse.jetty.ee8.servlet.ServletContextHandler; +import org.eclipse.jetty.ee8.servlet.ServletHolder; +import org.eclipse.jetty.ee8.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/jelly/pom.xml b/jelly/pom.xml index a7bcb2ffa..b8e14bc1d 100644 --- a/jelly/pom.xml +++ b/jelly/pom.xml @@ -67,17 +67,17 @@ org.eclipse.jetty - jetty-servlet + jetty-util test - org.eclipse.jetty - jetty-util + org.eclipse.jetty.ee8 + jetty-ee8-servlet test - org.eclipse.jetty - jetty-webapp + org.eclipse.jetty.ee8 + jetty-ee8-webapp test diff --git a/pom.xml b/pom.xml index 6387bd6f7..cde0d00d9 100644 --- a/pom.xml +++ b/pom.xml @@ -44,8 +44,10 @@ 999999-SNAPSHOT HEAD - 10.0.20 + 12.0.9 jenkinsci/stapler + + 17 @@ -57,6 +59,13 @@ pom import + + org.eclipse.jetty.ee8 + jetty-ee8-bom + ${jetty.version} + pom + import + commons-logging commons-logging