Miscellaneous dependency cleanup #2491
Conversation
basil
added
skip-changelog
| @@ -110,7 +110,6 @@ | |||
| <dependency> | |||
| <groupId>org.jenkinsci.plugins</groupId> | |||
| <artifactId>pipeline-model-definition</artifactId> | |||
| <version>2.2125.vddb_a_44a_d605e</version> | |||
There was a problem hiding this comment.
Managed in BOM so does not need to be declared explicitly.
| @@ -221,7 +220,6 @@ | |||
| <plugin> | |||
| <groupId>org.apache.maven.plugins</groupId> | |||
| <artifactId>maven-jar-plugin</artifactId> | |||
| <version>3.1.2</version> | |||
There was a problem hiding this comment.
Managed in plugin parent POM so does not need to be declared explicitly.
| @@ -141,7 +141,6 @@ | |||
| <plugin> | |||
| <groupId>org.apache.maven.plugins</groupId> | |||
| <artifactId>maven-jar-plugin</artifactId> | |||
| <version>3.1.2</version> | |||
There was a problem hiding this comment.
Managed in plugin parent POM so does not need to be declared explicitly.
| @@ -5,7 +5,7 @@ | |||
| <parent> | |||
| <groupId>org.jenkins-ci.plugins</groupId> | |||
| <artifactId>plugin</artifactId> | |||
| <version>4.72</version> | |||
| <version>4.73</version> | |||
There was a problem hiding this comment.
Latest at the time of this writing.
| @@ -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> | |||
There was a problem hiding this comment.
Factoring into a property for ease of Dependabot upgrades.
| @@ -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> | |||
There was a problem hiding this comment.
Latest at the time of this writing.
| <dependency> | ||
| <groupId>org.jenkins-ci.plugins</groupId> | ||
| <artifactId>cloudbees-bitbucket-branch-source</artifactId> | ||
| <version>2.9.11</version> | ||
| </dependency> |
There was a problem hiding this comment.
Managed in BOM so does not need to be managed here.
| @@ -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()))); | |||
There was a problem hiding this comment.
Unrelated to this PR, but most of my PR builds were tripping this assertion saying that the class name was PipelineRunImpl. Since this is queuing a build that eventually is scheduled, this test was inherently flaky, and the lines below explicitly deal with the case where the build has been taken off the queue and scheduled, so we do the same here. This made the test suite stable enough for me to eventually get a passing CI run.
|
Currently blocking jenkinsci/bom#2381 |
No description provided.