Update pipeline-model-definition and fix related test (#2555)

* Manage the versions of all Declarative dependencies * Update pipeline-model-definition to the published release --------- Co-authored-by: Devin Nusbaum <[email protected]> Co-authored-by: Olivier Lamy <[email protected]> Co-authored-by: Devin Nusbaum <[email protected]>
jenkinsci · Apr 10, 2024 · 8eebf88 · 8eebf88
1 parent 077e2e3
commit 8eebf88
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/...ocean-commons/src/main/java/io/jenkins/blueocean/commons/stapler/export/ExportConfig.java b/...ocean-commons/src/main/java/io/jenkins/blueocean/commons/stapler/export/ExportConfig.java
@@ -1,5 +1,7 @@
 package io.jenkins.blueocean.commons.stapler.export;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Controls the output behaviour.
  *
@@ -10,6 +12,7 @@ public class ExportConfig {
      * @deprecated
      *      Use getter and setter
      */
+    @SuppressFBWarnings(value="PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification="Preserve API compatibility")
     public boolean prettyPrint;
 
     private ClassAttributeBehaviour classAttribute = ClassAttributeBehaviour.IF_NEEDED;

diff --git a/blueocean-git-pipeline/pom.xml b/blueocean-git-pipeline/pom.xml
@@ -37,7 +37,7 @@
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
       <!-- TODO this is hard to manage; if needed, should be in BOM -->
-      <version>6.6.1.202309021850-r</version>
+      <version>6.9.0.202403050737-r</version>
     </dependency>
 
     <!-- test dependencies -->

diff --git a/...rc/main/java/io/jenkins/blueocean/blueocean_github_pipeline/GithubScmSaveFileRequest.java b/...rc/main/java/io/jenkins/blueocean/blueocean_github_pipeline/GithubScmSaveFileRequest.java
@@ -122,6 +122,7 @@ public Object save(@NonNull String apiUrl, @Nullable String owner, @Nullable Str
      *
      *  @return If new branch is created, sha of content.path on the new branch otherwise null
      */
+    @SuppressFBWarnings(value = "NP_UNWRITTEN_FIELD", justification = "Fields populated reflectively when deserializing JSON to Java")
     private String createBranchIfNotPresent(String apiUrl, String owner, String repoName, String accessToken) throws IOException {
         //If no branch is provided or auto branch create flag is false then skip creation of branch
         if(StringUtils.isBlank(content.getBranch())

diff --git a/...line-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineNodeTest.java b/...line-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineNodeTest.java
@@ -2311,9 +2311,9 @@ public void submitInputPostBlockWithParallelStages() throws Exception {
         assertEquals("exit 1", steps.get(0).get("displayDescription"));
         assertEquals("17", steps.get(1).get("id"));
         assertEquals("hello stable", steps.get(1).get("displayDescription"));
-        assertEquals("47", steps.get(2).get("id"));
+        assertEquals("50", steps.get(2).get("id"));
         assertEquals("Hello World from post", steps.get(2).get("displayDescription"));
-        assertEquals("48", steps.get(3).get("id"));
+        assertEquals("51", steps.get(3).get("id"));
         assertEquals("Wait for interactive input", steps.get(3).get("displayName"));
     }
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.74</version>
+    <version>4.81</version>
     <relativePath />
   </parent>
 
@@ -32,11 +32,13 @@
         when changing jenkins core version please remember to change it in Jenkinsfile as well jenkinsVersions
         and  acceptance-tests/runner/scripts/args.sh
     -->
-    <jenkins.version>2.401.3</jenkins.version>
+    <jenkins.version>2.426.3</jenkins.version>
     <javadoc.exec.goal>javadoc-no-fork</javadoc.exec.goal> <!-- stop initialize phase plugins executing twice -->
-    <byte-buddy.version>1.14.7</byte-buddy.version>
+    <byte-buddy.version>1.14.9</byte-buddy.version>
     <node.version>10.13.0</node.version>
     <npm.version>6.14.4</npm.version>
+    <!-- TODO: Remove this and related dependencyManagement entries once it is included in the BOM. -->
+    <pipeline-model-definition.version>2.2198.v41dd8ef6dd56</pipeline-model-definition.version>
     <jacoco.haltOnFailure>false</jacoco.haltOnFailure>
     <jacoco.line.coverage>0.70</jacoco.line.coverage>
     <jacoco.missedclass.coverage>0.00</jacoco.missedclass.coverage>
@@ -217,8 +219,8 @@
 
         <dependency>
             <groupId>io.jenkins.tools.bom</groupId>
-            <artifactId>bom-2.401.x</artifactId>
-            <version>2401.v7a_d68f8d0b_09</version>
+            <artifactId>bom-2.426.x</artifactId>
+            <version>2961.v1f472390972e</version>
             <scope>import</scope>
             <type>pom</type>
         </dependency>
@@ -514,16 +516,26 @@
             <artifactId>handy-uri-templates</artifactId>
             <version>2.1.8</version>
         </dependency>
-        <!-- enforcer RequireUpperBoundDeps -->
+        <!-- TODO: Remove these and associated property once included in BOM -->
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.10.5</version>
+            <groupId>org.jenkinsci.plugins</groupId>
+            <artifactId>pipeline-model-api</artifactId>
+            <version>${pipeline-model-definition.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
-            <version>2.5.1</version>
+            <groupId>org.jenkinsci.plugins</groupId>
+            <artifactId>pipeline-model-definition</artifactId>
+            <version>${pipeline-model-definition.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkinsci.plugins</groupId>
+            <artifactId>pipeline-model-extensions</artifactId>
+            <version>${pipeline-model-definition.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkinsci.plugins</groupId>
+            <artifactId>pipeline-stage-tags-metadata</artifactId>
+            <version>${pipeline-model-definition.version}</version>
         </dependency>
     </dependencies>
   </dependencyManagement>