Restore compatibility with withWar (#841)

jenkinsci · Sep 19, 2024 · a79e418 · a79e418
1 parent 189f355
commit a79e418
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/main/java/org/jvnet/hudson/test/RealJenkinsRule.java b/src/main/java/org/jvnet/hudson/test/RealJenkinsRule.java
@@ -33,10 +33,6 @@
 import hudson.security.csrf.CrumbExclusion;
 import hudson.util.NamingThreadFactory;
 import hudson.util.StreamCopyThread;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -91,6 +87,10 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import io.jenkins.test.fips.FIPSTestBundleProvider;
 import jenkins.model.Jenkins;
@@ -108,8 +108,8 @@
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest2;
-import org.kohsuke.stapler.StaplerResponse2;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.verb.POST;
 
 /**
@@ -1295,7 +1295,7 @@ public void doStatus(@QueryParameter String token) {
         private static final ExecutorService STEP_RUNNER = Executors.newSingleThreadExecutor(
                 new NamingThreadFactory(Executors.defaultThreadFactory(), RealJenkinsRule.class.getName() + ".STEP_RUNNER"));
         @POST
-        public void doStep(StaplerRequest2 req, StaplerResponse2 rsp) throws Throwable {
+        public void doStep(StaplerRequest req, StaplerResponse rsp) throws Throwable {
             InputPayload input = (InputPayload) Init2.readSer(req.getInputStream(), Endpoint.class.getClassLoader());
             checkToken(input.token);
             Step2<?> s = input.step;
@@ -1322,7 +1322,7 @@ public void doStep(StaplerRequest2 req, StaplerResponse2 rsp) throws Throwable {
         public HttpResponse doExit(@QueryParameter String token) throws IOException {
             checkToken(token);
             try (ACLContext ctx = ACL.as2(ACL.SYSTEM2)) {
-                return Jenkins.get().doSafeExit((StaplerRequest2) null);
+                return Jenkins.get().doSafeExit((StaplerRequest) null);
             }
         }
         public void doTimeout(@QueryParameter String token) {

diff --git a/src/main/java/org/jvnet/hudson/test/UnitTestSupportingPluginManager.java b/src/main/java/org/jvnet/hudson/test/UnitTestSupportingPluginManager.java
@@ -27,7 +27,6 @@
 import hudson.LocalPluginManager;
 import hudson.Plugin;
 import hudson.PluginManager;
-import jakarta.servlet.ServletContext;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -43,6 +42,7 @@
 import java.util.jar.Manifest;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.servlet.ServletContext;
 import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 

diff --git a/src/test/java/org/jvnet/hudson/test/RealJenkinsRuleTest.java b/src/test/java/org/jvnet/hudson/test/RealJenkinsRuleTest.java
@@ -51,12 +51,6 @@
 import hudson.model.Item;
 import hudson.model.listeners.ItemListener;
 import hudson.util.PluginServletFilter;
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -69,6 +63,12 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.model.JenkinsLocationConfiguration;
 import static org.junit.Assume.assumeThat;