From 92c01574f8584be07426016c288f95f42c82afe2 Mon Sep 17 00:00:00 2001
From: Bruno Verachten <gounthar@users.noreply.github.com>
Date: Fri, 13 Jun 2025 17:54:45 +0200
Subject: [PATCH] feat(java): Require Jenkins core 2.492.3 and Java 17

---
 pom.xml                                       | 25 ++++++-------------
 .../depbuilder/jenkins/DslBuild.java          |  6 ++---
 .../depbuilder/jenkins/DslProject.java        |  6 ++---
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8e1b666..da0f1b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,16 +4,15 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.4</version>
+        <version>5.17</version>
         <relativePath />
     </parent>
 
     <properties>
+        <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+        <jenkins.baseline>2.492</jenkins.baseline>
         <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
-        <jenkins.version>2.235.1</jenkins.version>
-        <java.level>8</java.level>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
 
@@ -42,7 +41,7 @@
     </licenses>
 
     <scm>
-        <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
+        <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
         <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
         <url>https://github.com/${gitHubRepo}</url>
         <tag>${scmTag}</tag>
@@ -55,7 +54,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
                 <configuration>
                     <!-- jdk version -->
                     <source>1.8</source>
@@ -65,21 +63,13 @@
         </plugins>
     </build>
 
-    <developers>
-        <developer>
-            <id>RoyalSloth</id>
-            <name>RoyalSloth</name>
-            <url>https://www.royalsloth.eu/products/depbuilder/</url>
-        </developer>
-    </developers>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.235.x</artifactId>
-                <version>11</version>
+                <artifactId>bom-${jenkins.baseline}.x</artifactId>
+                <version>4890.vfca_82c6741a_d</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -113,7 +103,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.7.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/eu/royalsloth/depbuilder/jenkins/DslBuild.java b/src/main/java/eu/royalsloth/depbuilder/jenkins/DslBuild.java
index 1b80bdb..b955a14 100644
--- a/src/main/java/eu/royalsloth/depbuilder/jenkins/DslBuild.java
+++ b/src/main/java/eu/royalsloth/depbuilder/jenkins/DslBuild.java
@@ -18,8 +18,8 @@
 import jenkins.model.ParameterizedJobMixIn;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.export.Exported;
 import org.kohsuke.stapler.verb.POST;
 
@@ -189,7 +189,7 @@ public JSONObject getDslBuild() {
      * @param job name of the job that should be built
      */
     @POST
-    public void doStartPartialBuild(StaplerRequest req, StaplerResponse rsp,
+    public void doStartPartialBuild(StaplerRequest2 req, StaplerResponse2 rsp,
             @QueryParameter String job) throws IOException {
         JenkinsUtil.getJenkins().checkPermission(Jenkins.ADMINISTER);
         if (job == null || job.isEmpty()) {
diff --git a/src/main/java/eu/royalsloth/depbuilder/jenkins/DslProject.java b/src/main/java/eu/royalsloth/depbuilder/jenkins/DslProject.java
index 5610668..8508154 100644
--- a/src/main/java/eu/royalsloth/depbuilder/jenkins/DslProject.java
+++ b/src/main/java/eu/royalsloth/depbuilder/jenkins/DslProject.java
@@ -21,7 +21,7 @@
 import org.kohsuke.stapler.verb.POST;
 
 import javax.annotation.CheckForNull;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.*;
@@ -144,8 +144,8 @@ public boolean getTableBasedRendering() {
     // For some reason I cannot get it to work via our custom doCheck method in the project descriptor.
     @POST
     @Override
-    public synchronized void doConfigSubmit(StaplerRequest req,
-            StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+    public synchronized void doConfigSubmit(StaplerRequest2 req,
+            StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
         JenkinsUtil.getJenkins().checkPermission(Jenkins.ADMINISTER);
 
         JSONObject json = req.getSubmittedForm();