|
28 | 28 | import hudson.model.UnprotectedRootAction; |
29 | 29 | import hudson.util.HttpResponses; |
30 | 30 | import java.util.Collections; |
| 31 | +import jakarta.servlet.http.HttpServletRequest; |
| 32 | +import jakarta.servlet.http.HttpServletResponse; |
| 33 | +import jakarta.servlet.http.HttpSession; |
31 | 34 | import net.sf.json.JSONArray; |
32 | 35 | import net.sf.json.JSONObject; |
33 | 36 | import org.apache.commons.lang.StringUtils; |
| 37 | +import org.eclipse.jetty.ee9.servlet.DefaultServlet; |
| 38 | +import org.eclipse.jetty.ee9.servlet.ServletContextHandler; |
| 39 | +import org.eclipse.jetty.ee9.servlet.ServletHolder; |
34 | 40 | import org.eclipse.jetty.server.Server; |
35 | 41 | import org.eclipse.jetty.server.ServerConnector; |
36 | | -import org.eclipse.jetty.ee8.servlet.DefaultServlet; |
37 | | -import org.eclipse.jetty.ee8.servlet.ServletContextHandler; |
38 | | -import org.eclipse.jetty.ee8.servlet.ServletHolder; |
39 | 42 | import org.junit.After; |
40 | 43 | import org.junit.Before; |
41 | 44 | import org.junit.Rule; |
|
44 | 47 | import org.jvnet.hudson.test.JenkinsRule; |
45 | 48 | import org.jvnet.hudson.test.TestExtension; |
46 | 49 | import org.kohsuke.stapler.HttpResponse; |
47 | | -import org.kohsuke.stapler.StaplerRequest; |
| 50 | +import org.kohsuke.stapler.StaplerRequest2; |
48 | 51 |
|
49 | 52 | import edu.umd.cs.findbugs.annotations.CheckForNull; |
50 | | -import javax.servlet.http.HttpServletRequest; |
51 | | -import javax.servlet.http.HttpServletResponse; |
52 | | -import javax.servlet.http.HttpSession; |
53 | 53 | import java.io.IOException; |
54 | 54 | import java.net.URI; |
55 | 55 | import java.net.URL; |
@@ -331,7 +331,7 @@ public String getUrlName() { |
331 | 331 | return "test"; |
332 | 332 | } |
333 | 333 |
|
334 | | - public HttpResponse doIndex(StaplerRequest request) { |
| 334 | + public HttpResponse doIndex(StaplerRequest2 request) { |
335 | 335 | HttpSession session = request.getSession(false); |
336 | 336 | if (session == null) { |
337 | 337 | sessionId = null; |
|
0 commit comments