diff --git a/pom.xml b/pom.xml index 4194c994..406c64fc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,20 +4,17 @@ org.jenkins-ci.plugins plugin - 4.88 + 5.1 999999-SNAPSHOT 2.462 - + - 2.472 + 2.479 jenkinsci/${project.artifactId}-plugin - - 2254.vcff7a_d4969e5 - 17 org.jenkins-ci.plugins diff --git a/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java b/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java index 4e303f14..d922d1eb 100644 --- a/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java +++ b/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java @@ -28,14 +28,17 @@ import hudson.model.UnprotectedRootAction; import hudson.util.HttpResponses; import java.util.Collections; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; +import org.eclipse.jetty.ee9.servlet.DefaultServlet; +import org.eclipse.jetty.ee9.servlet.ServletContextHandler; +import org.eclipse.jetty.ee9.servlet.ServletHolder; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.ee8.servlet.DefaultServlet; -import org.eclipse.jetty.ee8.servlet.ServletContextHandler; -import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -44,12 +47,9 @@ import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; import edu.umd.cs.findbugs.annotations.CheckForNull; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import java.io.IOException; import java.net.URI; import java.net.URL; @@ -331,7 +331,7 @@ public String getUrlName() { return "test"; } - public HttpResponse doIndex(StaplerRequest request) { + public HttpResponse doIndex(StaplerRequest2 request) { HttpSession session = request.getSession(false); if (session == null) { sessionId = null; diff --git a/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java b/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java index 84c378fe..84f4a449 100644 --- a/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java +++ b/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java @@ -28,14 +28,16 @@ import hudson.model.User; import hudson.util.Scrambler; import java.util.Collections; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jenkins.security.ApiTokenProperty; import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.eclipse.jetty.ee9.servlet.DefaultServlet; +import org.eclipse.jetty.ee9.servlet.ServletContextHandler; +import org.eclipse.jetty.ee9.servlet.ServletHolder; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.ee8.servlet.DefaultServlet; -import org.eclipse.jetty.ee8.servlet.ServletContextHandler; -import org.eclipse.jetty.ee8.servlet.ServletHolder; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -43,8 +45,6 @@ import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URI; import java.net.URL;