Skip to content

Commit 1f980b7

Browse files
bump jenkins-bom 2.289.x (#517)
1 parent 2f10388 commit 1f980b7

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<properties>
2929
<changelist>999999-SNAPSHOT</changelist>
3030
<gitHubRepo>jenkinsci/bitbucket-branch-source-plugin</gitHubRepo>
31-
<jenkins.version>2.263.4</jenkins.version>
31+
<jenkins.version>2.289.1</jenkins.version>
3232
<java.level>8</java.level>
3333
<hpi.compatibleSinceVersion>2.0</hpi.compatibleSinceVersion>
3434
</properties>
@@ -63,8 +63,8 @@
6363
<dependencies>
6464
<dependency>
6565
<groupId>io.jenkins.tools.bom</groupId>
66-
<artifactId>bom-2.263.x</artifactId>
67-
<version>950.v396cb834de1e</version>
66+
<artifactId>bom-2.289.x</artifactId>
67+
<version>1013.vf8058992a042</version>
6868
<scope>import</scope>
6969
<type>pom</type>
7070
</dependency>
@@ -135,7 +135,6 @@
135135
<dependency>
136136
<groupId>org.jenkins-ci.plugins.workflow</groupId>
137137
<artifactId>workflow-multibranch</artifactId>
138-
<version>2.22</version>
139138
<scope>test</scope>
140139
</dependency>
141140
<dependency>

src/test/java/integration/ScanningFailuresTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ private void getBranchesFails(Callable<Throwable> exception, Result expectedResu
146146

147147
when(api.getBranches()).thenThrow(exception.call());
148148

149-
if (Result.NOT_BUILT.equals(expectedResult)) {
150-
// when not built the future will never complete and the log may not contain the exception stack trace
149+
if (Result.NOT_BUILT.equals(expectedResult) || Result.ABORTED.equals(expectedResult)) {
150+
// when not built or aborted the future will never complete and the log may not contain the exception stack trace
151151
mp.scheduleBuild2(0);
152152
j.waitUntilNoActivity();
153153
assertThat(mp.getIndexing().getResult(), is(expectedResult));

0 commit comments

Comments
 (0)