diff --git a/pom.xml b/pom.xml
index 35980ffa..c08539b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
org.jenkins-ci.plugins
plugin
- 4.41
+ 5.7
xcode-plugin
@@ -44,28 +44,6 @@
repo
-
-
- rayhilton
- Ray Yamamoto Hilton
- ray.hilton@gmail.com
-
-
- aheritier
- Arnaud Heritier
- aheritier@apache.org
-
-
- lacostej
- Jerome Lacoste
- jerome.lacoste@gmail.com
-
-
- kazuhidet
- Kazuhide Takahashi
- kazuhide.t@linux-powered.com
-
-
scm:git:https://github.com/${gitHubRepo}.git
scm:git:git@github.com:${gitHubRepo}.git
@@ -88,8 +66,8 @@
io.jenkins.tools.bom
- bom-2.319.x
- 1466.v85a_616ea_b_87c
+ bom-${jenkins.baseline}.x
+ 4136.vca_c3202a_7fd1
pom
import
@@ -146,7 +124,9 @@
2.0.17
999999-SNAPSHOT
jenkinsci/xcode-plugin
- 2.319.1
+
+ 2.479
+ ${jenkins.baseline}.1
diff --git a/src/main/java/au/com/rayh/GlobalConfigurationImpl.java b/src/main/java/au/com/rayh/GlobalConfigurationImpl.java
index ce182038..b6c4372d 100644
--- a/src/main/java/au/com/rayh/GlobalConfigurationImpl.java
+++ b/src/main/java/au/com/rayh/GlobalConfigurationImpl.java
@@ -29,7 +29,7 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
import hudson.Extension;
import hudson.model.AbstractProject;
@@ -42,7 +42,7 @@
import java.util.logging.Logger;
import edu.umd.cs.findbugs.annotations.CheckForNull;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
/**
* Stores global configuration for XCode.
@@ -230,7 +230,7 @@ public String getDisplayName() {
}
@Override
- public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
+ public boolean configure(StaplerRequest2 req, JSONObject formData) throws FormException {
req.bindJSON(this, formData);
setKeychains(new ArrayList<>(req.bindParametersToList(Keychain.class, "keychain.")));
setTeams(new ArrayList<>(req.bindParametersToList(Team.class, "team.")));
diff --git a/src/main/java/hudson/plugins/xcode/XcodeInstallation.java b/src/main/java/hudson/plugins/xcode/XcodeInstallation.java
index 6312a741..35215357 100644
--- a/src/main/java/hudson/plugins/xcode/XcodeInstallation.java
+++ b/src/main/java/hudson/plugins/xcode/XcodeInstallation.java
@@ -16,7 +16,7 @@
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
import java.io.File;
import java.io.IOException;
@@ -111,7 +111,7 @@ public String getDisplayName() {
}
@Override
- public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+ public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
setInstallations(req.bindJSONToList(clazz, json.get("tool")).toArray(new XcodeInstallation[0]));
save();
return true;