Adapt for jakarta

jenkinsci · Nov 1, 2024 · f821fe7 · f821fe7
1 parent fc77cdc
commit f821fe7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java b/plugin/src/main/java/io/jenkins/plugins/casc/TokenReloadAction.java
@@ -9,9 +9,9 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 @Extension
@@ -42,7 +42,7 @@ public String getUrlName() {
     }
 
     @RequirePOST
-    public void doIndex(StaplerRequest request, StaplerResponse response) throws IOException {
+    public void doIndex(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
         String token = getReloadToken();
 
         if (token == null || token.isEmpty()) {

diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletRequest.java
@@ -7,19 +7,19 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
 
 public class MockHttpServletRequest implements HttpServletRequest {
 

diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java b/test-harness/src/test/java/io/jenkins/plugins/casc/MockHttpServletResponse.java
@@ -3,9 +3,9 @@
 import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.Locale;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class MockHttpServletResponse implements HttpServletResponse {
 

diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/TokenReloadActionTest.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;