From 12dc604c95b6d0b60775e0a0cbcd2a20cb0c3a86 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 21 Jan 2025 17:31:31 -0800 Subject: [PATCH] Migrate from EE 8 to EE 9 --- .../jenkins/plugins/http_request/HttpRequestGlobalConfig.java | 4 ++-- .../java/jenkins/plugins/http_request/HttpRequestTest.java | 2 +- .../jenkins/plugins/http_request/HttpRequestTestBase.java | 2 +- src/test/java/jenkins/plugins/http_request/Registers.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/jenkins/plugins/http_request/HttpRequestGlobalConfig.java b/src/main/java/jenkins/plugins/http_request/HttpRequestGlobalConfig.java index 9e4ffa28..d49f638f 100644 --- a/src/main/java/jenkins/plugins/http_request/HttpRequestGlobalConfig.java +++ b/src/main/java/jenkins/plugins/http_request/HttpRequestGlobalConfig.java @@ -6,7 +6,7 @@ import net.sf.json.JSONObject; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; import hudson.Extension; import hudson.XmlFile; @@ -55,7 +55,7 @@ protected XmlFile getConfigFile() { } @Override - public boolean configure(StaplerRequest req, JSONObject json) { + public boolean configure(StaplerRequest2 req, JSONObject json) { req.bindJSON(this, json); save(); return true; diff --git a/src/test/java/jenkins/plugins/http_request/HttpRequestTest.java b/src/test/java/jenkins/plugins/http_request/HttpRequestTest.java index 56bdea19..1ef2b592 100644 --- a/src/test/java/jenkins/plugins/http_request/HttpRequestTest.java +++ b/src/test/java/jenkins/plugins/http_request/HttpRequestTest.java @@ -25,7 +25,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.http.HttpResponse; import org.apache.http.ProtocolVersion; diff --git a/src/test/java/jenkins/plugins/http_request/HttpRequestTestBase.java b/src/test/java/jenkins/plugins/http_request/HttpRequestTestBase.java index 3d89892b..49ab48e7 100644 --- a/src/test/java/jenkins/plugins/http_request/HttpRequestTestBase.java +++ b/src/test/java/jenkins/plugins/http_request/HttpRequestTestBase.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.http.entity.ContentType; import org.eclipse.jetty.http.HttpHeader; diff --git a/src/test/java/jenkins/plugins/http_request/Registers.java b/src/test/java/jenkins/plugins/http_request/Registers.java index 7215a03e..9f3ee661 100644 --- a/src/test/java/jenkins/plugins/http_request/Registers.java +++ b/src/test/java/jenkins/plugins/http_request/Registers.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.concurrent.ExecutionException; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import org.apache.http.HttpHeaders; import org.apache.http.entity.ContentType;