diff --git a/pom.xml b/pom.xml index 03047bc..0c7f55d 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,8 @@ jenkinsci/${project.artifactId}-plugin - 2.472 + + 2.472-rc35224.83b_736a_f3fc3 bom-2.426.x 3208.vb_21177d4b_cd9 @@ -122,6 +123,12 @@ import pom + + + jakarta.servlet + jakarta.servlet-api + 5.0.0 + diff --git a/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/AbstractOpenShiftBearerTokenCredentialFIPSTest.java b/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/AbstractOpenShiftBearerTokenCredentialFIPSTest.java index 025d06b..2165d3f 100644 --- a/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/AbstractOpenShiftBearerTokenCredentialFIPSTest.java +++ b/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/AbstractOpenShiftBearerTokenCredentialFIPSTest.java @@ -8,8 +8,8 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; -import org.eclipse.jetty.ee8.servlet.ServletContextHandler; -import org.eclipse.jetty.ee8.servlet.ServletHolder; +import org.eclipse.jetty.ee9.servlet.ServletContextHandler; +import org.eclipse.jetty.ee9.servlet.ServletHolder; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.junit.After; import org.junit.Before; diff --git a/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/MockHttpServlet.java b/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/MockHttpServlet.java index 39cd8a8..0ed298a 100644 --- a/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/MockHttpServlet.java +++ b/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/MockHttpServlet.java @@ -1,11 +1,11 @@ package org.jenkinsci.plugins.kubernetes.credentials; -import org.eclipse.jetty.ee8.nested.Request; +import org.eclipse.jetty.ee9.nested.Request; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/OpenShiftBearerTokenCredentialTest.java b/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/OpenShiftBearerTokenCredentialTest.java index fcc7499..d8fe7bb 100644 --- a/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/OpenShiftBearerTokenCredentialTest.java +++ b/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/OpenShiftBearerTokenCredentialTest.java @@ -3,8 +3,8 @@ import com.cloudbees.plugins.credentials.CredentialsScope; import hudson.util.Secret; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.ee8.servlet.ServletContextHandler; -import org.eclipse.jetty.ee8.servlet.ServletHolder; +import org.eclipse.jetty.ee9.servlet.ServletContextHandler; +import org.eclipse.jetty.ee9.servlet.ServletHolder; import org.junit.After; import org.junit.Before; import org.junit.Rule;