Merge branch 'master' into Hardikrathod01-issue_702_log_appropriate_messages

* master:
  Bump org.jenkins-ci.plugins:plugin from 5.26 to 5.28 in the jenkins group (#753)

Author: rantoniuk

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.26</version>
+    <version>5.28</version>
     <relativePath />
   </parent>
 

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

@@ -106,11 +106,9 @@ void testPipelineWithJiraSite(JenkinsRule r) throws Exception {
         jiraGlobalConfiguration.setSites(Collections.singletonList(site));
         doReturn(true).when(site).progressMatchingIssues(anyString(), anyString(), anyString(), any());
         WorkflowJob job = r.createProject(WorkflowJob.class);
-        job.setDefinition(new CpsFlowDefinition(
-                """
+        job.setDefinition(new CpsFlowDefinition("""
                         jiraExecuteWorkflow(jqlSearch: 'search', workflowActionName: 'action', comment: 'comment')
-                """,
-                true));
+                """, true));
         WorkflowRun b = r.buildAndAssertStatus(Result.SUCCESS, job);
         r.assertLogContains("[Jira] Updating issues using workflow action action.", b);
     }

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

@@ -69,11 +69,9 @@ void setLabelsPersists() {
     @Test
     void testPipeline(JenkinsRule r) throws Exception {
         WorkflowJob job = r.createProject(WorkflowJob.class);
-        job.setDefinition(new CpsFlowDefinition(
-                """
+        job.setDefinition(new CpsFlowDefinition("""
                         jiraCommentIssues(issueSelector: DefaultSelector(), scm: null)
-                """,
-                true));
+                """, true));
         WorkflowRun b = r.buildAndAssertStatus(Result.FAILURE, job);
         r.assertLogContains(" Unsupported run type", b);
     }

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

@@ -27,11 +27,9 @@ void testPipeline(JenkinsRule r) throws Exception {
         JiraGlobalConfiguration jiraGlobalConfiguration = JiraGlobalConfiguration.get();
         jiraGlobalConfiguration.setSites(Collections.singletonList(site));
         WorkflowJob job = r.createProject(WorkflowJob.class);
-        job.setDefinition(new CpsFlowDefinition(
-                """
+        job.setDefinition(new CpsFlowDefinition("""
                         jiraMarkVersionReleased(jiraProjectKey: 'PROJECT', jiraRelease: 'release', jiraDescription: 'description')
-                """,
-                true));
+                """, true));
         WorkflowRun b = r.buildAndAssertStatus(Result.SUCCESS, job);
         r.assertLogContains("[Jira] Marking version release in project PROJECT as released.", b);
     }

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

@@ -32,11 +32,9 @@ void testPipelineWithJiraSite(JenkinsRule r) throws Exception {
         jiraGlobalConfiguration.setSites(Collections.singletonList(site));
         doReturn(session).when(site).getSession(any());
         WorkflowJob job = r.createProject(WorkflowJob.class);
-        job.setDefinition(new CpsFlowDefinition(
-                """
+        job.setDefinition(new CpsFlowDefinition("""
                         jiraCreateVersion(jiraVersion: 'Version', jiraProjectKey: 'project-key')
-                """,
-                true));
+                """, true));
         WorkflowRun b = r.buildAndAssertStatus(Result.SUCCESS, job);
         r.assertLogContains("[Jira] Creating version Version in project project-key.", b);
     }

src/test/java/hudson/plugins/jira/listissuesparameter/JiraIssueParameterTest.java

@@ -25,14 +25,12 @@ class JiraIssueParameterTest {
     @Test
     void scriptedPipeline(JenkinsRule r) throws Exception {
         WorkflowJob p = r.createProject(WorkflowJob.class);
-        p.setDefinition(new CpsFlowDefinition(
-                """
+        p.setDefinition(new CpsFlowDefinition("""
                 properties([
                   parameters([
                     jiraIssue(name: 'JIRA_ISSUE', description: 'Jira Test Description', jiraIssueFilter: 'project=PRJ')
                   ])
-                ])""",
-                true));
+                ])""", true));
         r.buildAndAssertSuccess(p);
 
         ParametersDefinitionProperty parameters = p.getProperty(ParametersDefinitionProperty.class);

src/test/java/hudson/plugins/jira/pipeline/IssueFieldUpdateStepTest.java

@@ -142,15 +142,13 @@ void checkSubmit() throws InterruptedException, IOException {
     @Test
     void testPipeline() throws Exception {
         WorkflowJob job = r.createProject(WorkflowJob.class);
-        job.setDefinition(new CpsFlowDefinition(
-                """
+        job.setDefinition(new CpsFlowDefinition("""
                         jiraUpdateIssueField(
                                 issueSelector: ExplicitSelector("JIRA-123"),
                                 fieldId: "field",
                                 fieldValue: "value"
                             )
-                """,
-                true));
+                """, true));
         r.buildAndAssertStatus(Result.SUCCESS, job);
     }
 

src/test/java/hudson/plugins/jira/versionparameter/JiraReleaseVersionParameterTest.java

@@ -16,14 +16,12 @@ class JiraReleaseVersionParameterTest {
     @Test
     void scriptedPipeline(JenkinsRule r) throws Exception {
         WorkflowJob p = r.createProject(WorkflowJob.class);
-        p.setDefinition(new CpsFlowDefinition(
-                """
+        p.setDefinition(new CpsFlowDefinition("""
                 properties([
                   parameters([
                     jiraReleaseVersion(name: 'JIRA', description: 'Jira Test Description', jiraProjectKey: 'PRJ', jiraReleasePattern: 'v[0-9]+', jiraShowReleased: 'true', jiraShowArchived: 'true')
                   ])
-                ])""",
-                true));
+                ])""", true));
         r.buildAndAssertSuccess(p);
 
         ParametersDefinitionProperty parameters = p.getProperty(ParametersDefinitionProperty.class);