Merge pull request #716 from rantoniuk/701-bump-to-next-lts

feat: Update Jenkins baseline version to 2.492.x

Author: rantoniuk

pom.xml

@@ -53,7 +53,7 @@
     <jira-rest-client.version>6.0.2</jira-rest-client.version>
     <fugue.version>4.7.2</fugue.version>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.baseline>2.492</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.3</jenkins.version>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>

src/main/java/hudson/plugins/jira/pipeline/IssueFieldUpdateStep.java

@@ -138,15 +138,16 @@ public void submitFields(JiraSession session, String issueId, List<JiraIssueFiel
         } catch (RestClientException e) {
 
             if (e.getStatusCode().or(0).equals(404)) {
-                logger.println(issueId + " - Jira issue not found");
+                logger.println("[Jira] " + issueId + " - Jira issue not found");
             }
 
             if (e.getStatusCode().or(0).equals(403)) {
-                logger.println(issueId + " - Jenkins Jira user does not have permissions to comment on this issue");
+                logger.println("[Jira] " + issueId
+                        + " - Jenkins Jira user does not have permissions to comment on this issue");
             }
 
             if (e.getStatusCode().or(0).equals(401)) {
-                logger.println(issueId + " - Jenkins Jira authentication problem");
+                logger.println("[Jira] " + issueId + " - Jenkins Jira authentication problem");
             }
 
             logger.println(Messages.FailedToUpdateIssue(issueId));

src/test/java/hudson/plugins/jira/UpdaterTest.java

@@ -4,7 +4,10 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
@@ -38,7 +41,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
-import jenkins.model.Jenkins;
 import org.hamcrest.Matchers;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -295,12 +297,8 @@ void issueIsRemovedFromCarryOverListAfterSubmission() throws RestClientException
      *
      */
     @Test
-    @WithoutJenkins
-    void getChangesUsingReflectionForWorkflowJob() throws IOException {
-        Jenkins jenkins = mock(Jenkins.class);
-
-        when(jenkins.getRootDirFor(Mockito.any())).thenReturn(folder);
-        WorkflowJob workflowJob = new WorkflowJob(jenkins, "job");
+    void getChangesUsingReflectionForWorkflowJob(JenkinsRule r) throws IOException {
+        WorkflowJob workflowJob = new WorkflowJob(r.getInstance(), "job");
         WorkflowRun workflowRun = new WorkflowRun(workflowJob);
 
         ChangeLogSet.createEmpty(workflowRun);