feat(java): Require Jenkins core 2.479.1 and Java 17.

Author: gounthar

pom.xml

@@ -4,7 +4,8 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>3.53</version>
+    <version>5.7</version>
+    <relativePath></relativePath>
   </parent>
 
   <artifactId>stash-pullrequest-builder</artifactId>
@@ -15,26 +16,8 @@
   <description>This plugin builds Stash pull requests and posts the build results on Stash</description>
   <url>https://github.com/jenkinsci/stash-pullrequest-builder-plugin</url>
 
-  <developers>
-    <developer>
-      <id>nemccarthy</id>
-      <name>Nathan McCarthy</name>
-      <email>nem@nemccarthy.me</email>
-    </developer>
-    <developer>
-      <id>jimklimov</id>
-      <name>Jim Klimov</name>
-      <email>jimklimov@gmail.com</email>
-    </developer>
-    <developer>
-      <id>jbochenski</id>
-      <name>Jakub Bocheński</name>
-      <email>kuba.bochenski+stash-pullrequest-builder-plugin@gmail.com</email>
-    </developer>
-  </developers>
-
   <scm>
-    <connection>scm:git:ssh://github.com/jenkinsci/stash-pullrequest-builder-plugin.git</connection>
+    <connection>scm:git:https://github.com/jenkinsci/stash-pullrequest-builder-plugin.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/jenkinsci/stash-pullrequest-builder-plugin.git</developerConnection>
     <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/stash-pullrequest-builder-plugin</url>
@@ -56,19 +39,22 @@
   <properties>
     <revision>1.18</revision>
     <changelist>-SNAPSHOT</changelist>
-    <java.level>8</java.level>
-    <jenkins.version>2.60.3</jenkins.version>
+    <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+    <slf4jVersion>1.7.25</slf4jVersion>
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Low</spotbugs.threshold>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13</version>
-        <scope>test</scope>
+        <groupId>io.jenkins.tools.bom</groupId>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
+        <version>4136.vca_c3202a_7fd1</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -77,22 +63,18 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>jackson2-api</artifactId>
-      <version>2.9.9.1</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>2.1.5</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>apache-httpcomponents-client-4-api</artifactId>
-      <version>4.5.5-3.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>${slf4jVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -109,7 +91,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-job</artifactId>
-      <version>2.9</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java

@@ -35,7 +35,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 stashpullrequestbuilder.stashpullrequestbuilder.stash.StashApiClient;
 
 /** Created by Nathan McCarthy */
@@ -376,7 +376,7 @@ public String getDisplayName() {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
       enablePipelineSupport = false;
 
       req.bindJSON(this, json);

src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashRepository.java

@@ -52,7 +52,9 @@ public class StashRepository {
   private static final String BUILD_START_MESSAGE = "BuildStarted";
   private static final String BUILD_FINISH_MESSAGE = "BuildFinished";
   private static final String BUILD_CANCEL_MESSAGE = "BuildCanceled";
-  private static final String[] BUILD_STATUSES = {BUILD_START_MESSAGE, BUILD_FINISH_MESSAGE, BUILD_CANCEL_MESSAGE};
+  private static final String[] BUILD_STATUSES = {
+    BUILD_START_MESSAGE, BUILD_FINISH_MESSAGE, BUILD_CANCEL_MESSAGE
+  };
   private static final String BUILD_MARKER = "[*%s* **%s**] %s into %s";
 
   private static final String BUILD_STATUS_REGEX =
@@ -259,8 +261,10 @@ private List<StashPullRequestBuildTarget> getBuildTargetsWithoutOnlyBuildOnComme
 
       // These will match any start or finish message -- need to check commits
       String escapedBuildName = Pattern.quote(job.getDisplayName());
-      String project_build_start = String.format(BUILD_STATUS_REGEX, BUILD_START_MESSAGE, escapedBuildName);
-      String project_build_finished = String.format(BUILD_STATUS_REGEX, BUILD_FINISH_MESSAGE, escapedBuildName);
+      String project_build_start =
+          String.format(BUILD_STATUS_REGEX, BUILD_START_MESSAGE, escapedBuildName);
+      String project_build_finished =
+          String.format(BUILD_STATUS_REGEX, BUILD_FINISH_MESSAGE, escapedBuildName);
       Matcher startMatcher =
           Pattern.compile(project_build_start, Pattern.CASE_INSENSITIVE).matcher(content);
       Matcher finishMatcher =
@@ -331,7 +335,8 @@ private String postBuildStatusComment(
       throws StashApiException {
     String sourceCommit = pullRequest.getFromRef().getLatestCommit();
     String destinationCommit = pullRequest.getToRef().getLatestCommit();
-    String comment = format(BUILD_MARKER, buildMessage, job.getDisplayName(), sourceCommit, destinationCommit);
+    String comment =
+        format(BUILD_MARKER, buildMessage, job.getDisplayName(), sourceCommit, destinationCommit);
     StashPullRequestComment commentResponse;
     commentResponse =
         this.client.postPullRequestComment(pullRequest.getId(), comment, buildCommandCommentId);
@@ -579,17 +584,12 @@ public void postFinishedComment(
     String message = getMessageForBuildResult(buildResult);
     String comment =
         format(
-            BUILD_MARKER,
-            BUILD_FINISH_MESSAGE,
-            job.getDisplayName(),
-            sourceCommit,
-            destinationCommit)
-        + format(
-            BUILD_FINISH_SENTENCE,
-            message,
-            buildUrl,
-            buildNumber,
-            duration);
+                BUILD_MARKER,
+                BUILD_FINISH_MESSAGE,
+                job.getDisplayName(),
+                sourceCommit,
+                destinationCommit)
+            + format(BUILD_FINISH_SENTENCE, message, buildUrl, buildNumber, duration);
 
     comment = comment.concat(additionalComment);
 
@@ -684,7 +684,8 @@ private void deletePreviousBuildFinishedComments(StashPullRequestResponseValue p
         continue;
       }
 
-      String project_build_finished = format(BUILD_STATUS_REGEX, BUILD_FINISH_MESSAGE, job.getDisplayName());
+      String project_build_finished =
+          format(BUILD_STATUS_REGEX, BUILD_FINISH_MESSAGE, job.getDisplayName());
       Matcher finishMatcher =
           Pattern.compile(project_build_finished, Pattern.CASE_INSENSITIVE).matcher(content);
 

src/test/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTriggerTest.java

@@ -15,10 +15,10 @@
 import hudson.util.FormValidation;
 import hudson.util.FormValidation.Kind;
 import hudson.util.Secret;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.Collections;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
 import net.sf.json.JSONObject;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.junit.Rule;
@@ -27,7 +27,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.kohsuke.stapler.RequestImpl;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.WebApp;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -48,7 +48,7 @@ public class StashBuildTriggerTest {
   @Rule public JenkinsRule jenkinsRule = new JenkinsRule();
   @Rule public MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS);
 
-  private StaplerRequest makeStaplerRequest() {
+  private StaplerRequest2 makeStaplerRequest() {
     ServletContext servletContext = mock(ServletContext.class);
     WebApp webApp = new WebApp(servletContext);
 
@@ -64,7 +64,7 @@ private StaplerRequest makeStaplerRequest() {
   public void pipeline_jobs_not_supported_by_default() throws Exception {
     JSONObject json = new JSONObject();
 
-    StaplerRequest staplerRequest = makeStaplerRequest();
+    StaplerRequest2 staplerRequest = makeStaplerRequest();
     descriptor.configure(staplerRequest, json);
 
     FreeStyleProject project = jenkinsRule.createFreeStyleProject();
@@ -79,7 +79,7 @@ public void pipeline_jobs_not_supported_when_pipeline_support_disabled() throws
     JSONObject json = new JSONObject();
     json.put("enablePipelineSupport", "false");
 
-    StaplerRequest staplerRequest = makeStaplerRequest();
+    StaplerRequest2 staplerRequest = makeStaplerRequest();
     descriptor.configure(staplerRequest, json);
 
     FreeStyleProject project = jenkinsRule.createFreeStyleProject();
@@ -94,7 +94,7 @@ public void pipeline_jobs_supported_when_pipeline_support_enabled() throws Excep
     JSONObject json = new JSONObject();
     json.put("enablePipelineSupport", "true");
 
-    StaplerRequest staplerRequest = makeStaplerRequest();
+    StaplerRequest2 staplerRequest = makeStaplerRequest();
     descriptor.configure(staplerRequest, json);
 
     FreeStyleProject project = jenkinsRule.createFreeStyleProject();