From eae4c40de41a63f8f3e0547e57ba013d25a2eba3 Mon Sep 17 00:00:00 2001
From: Bruno Verachten <gounthar@users.noreply.github.com>
Date: Tue, 24 Jun 2025 18:43:58 +0200
Subject: [PATCH] feat(java): Require Jenkins core 2.492.3 and Java 17

---
 pom.xml                                       | 33 ++++---------------
 .../au/com/rayh/GlobalConfigurationImpl.java  |  6 ++--
 .../plugins/xcode/XcodeInstallation.java      |  4 +--
 3 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/pom.xml b/pom.xml
index 35980ffa..dd0754f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.41</version>
+    <version>5.17</version>
     <relativePath />
   </parent>
   <artifactId>xcode-plugin</artifactId>
@@ -44,28 +44,6 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
-  <developers>
-    <developer>
-      <id>rayhilton</id>
-      <name>Ray Yamamoto Hilton</name>
-      <email>ray.hilton@gmail.com</email>
-    </developer>
-    <developer>
-      <id>aheritier</id>
-      <name>Arnaud Heritier</name>
-      <email>aheritier@apache.org</email>
-    </developer>
-    <developer>
-      <id>lacostej</id>
-      <name>Jerome Lacoste</name>
-      <email>jerome.lacoste@gmail.com</email>
-    </developer>
-    <developer>
-      <id>kazuhidet</id>
-      <name>Kazuhide Takahashi</name>
-      <email>kazuhide.t@linux-powered.com</email>
-    </developer>
-  </developers>
   <scm>
     <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
     <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
@@ -88,8 +66,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.319.x</artifactId>
-        <version>1466.v85a_616ea_b_87c </version>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
+        <version>4948.v2f88b_118dd7b_ </version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -139,14 +117,15 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>jaxb</artifactId>
-      <version>2.3.6-1</version>
     </dependency>
   </dependencies>
   <properties>
     <revision>2.0.17</revision>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/xcode-plugin</gitHubRepo>
-    <jenkins.version>2.319.1</jenkins.version>
+    <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+    <jenkins.baseline>2.492</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
   </properties>
   <build>
     <plugins>
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;