Miscellaneous dependency cleanup (#2491)

* Miscellaneous dependency cleanup * Test flake
jenkinsci · Sep 8, 2023 · 2d9003b · 2d9003b
1 parent dd4f281
commit 2d9003b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/blueocean-pipeline-api-impl/pom.xml b/blueocean-pipeline-api-impl/pom.xml
@@ -110,7 +110,6 @@
         <dependency>
             <groupId>org.jenkinsci.plugins</groupId>
             <artifactId>pipeline-model-definition</artifactId>
-            <version>2.2125.vddb_a_44a_d605e</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -221,7 +220,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

diff --git a/...line-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/RestartStageTest.java b/...line-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/RestartStageTest.java
@@ -13,6 +13,9 @@
 import java.util.Map;
 import java.util.Optional;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -70,7 +73,7 @@ public void restart_stage() throws Exception {
                                       + "/runs/1/nodes/" + res.get( "id" ) + "/restart",
                                   restartMap);
 
-        assertEquals( QueuedBlueRun.class.getName(), restartResult.get( "_class" ) );
+        assertThat(restartResult.get("_class"), anyOf(is(QueuedBlueRun.class.getName()), is(PipelineRunImpl.class.getName())));
         int id = Integer.parseInt((String)restartResult.get( "id" ));
 
         // depending on build still in queue or not when guessing the build number

diff --git a/blueocean-rest-impl/pom.xml b/blueocean-rest-impl/pom.xml
@@ -141,7 +141,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.72</version>
+    <version>4.73</version>
     <relativePath />
   </parent>
 
@@ -34,6 +34,7 @@
     -->
     <jenkins.version>2.401.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>
     <frontend-version>1.12.0</frontend-version>
     <node.version>10.13.0</node.version>
     <npm.version>6.14.4</npm.version>
@@ -218,7 +219,7 @@
         <dependency>
             <groupId>io.jenkins.tools.bom</groupId>
             <artifactId>bom-2.401.x</artifactId>
-            <version>2329.v078520e55c19</version>
+            <version>2401.v7a_d68f8d0b_09</version>
             <scope>import</scope>
             <type>pom</type>
         </dependency>
@@ -349,11 +350,6 @@
         </dependency>
 
         <!-- Other -->
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>cloudbees-bitbucket-branch-source</artifactId>
-            <version>2.9.11</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
@@ -478,12 +474,12 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.14.7</version>
+            <version>${byte-buddy.version}</version>
         </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy-agent</artifactId>
-            <version>1.12.13</version>
+            <version>${byte-buddy.version}</version>
         </dependency>
         <!-- some tests need to  write final field -->
         <dependency>