Skip to content

Commit

Permalink
Merge pull request #544 from oleg-nenashev/jenkins/2.303.1
Browse files Browse the repository at this point in the history
Update Jenkins core to 2.303.1 + update to recent Eclipse Jetty and Plugin BOM
  • Loading branch information
oleg-nenashev authored Aug 26, 2021
2 parents 178900d + 1ad7b96 commit 8062dd6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ THE SOFTWARE.
<gitHubRepo>jenkinsci/jenkinsfile-runner</gitHubRepo>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.level>8</java.level>
<jenkins.version>2.289.1</jenkins.version>
<jenkins.bom.baseline>bom-2.289.x</jenkins.bom.baseline>
<jenkins.bom.version>918.vae501d2cdc99</jenkins.bom.version>
<jetty.version>9.4.39.v20210325</jetty.version>
<jenkins.version>2.303.1</jenkins.version>
<jenkins.bom.baseline>bom-2.303.x</jenkins.bom.baseline>
<jenkins.bom.version>937.v51fde92016ed</jenkins.bom.version>
<jetty.version>9.4.43.v20210629</jetty.version>
<jenkins-test-harness.version>1589.vc23fca066d5c</jenkins-test-harness.version>
<!--TODO: Reenable once all the issues are fixed (JENKINS-57353)-->
<findbugs.failOnError>false</findbugs.failOnError>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void shouldFailWithWrongJenkinsfile() throws Throwable {

int result = new JFRTestUtil().run(jenkinsfile);
assertThat("JFR should fail when there is no Jenkinsfile", result, not(equalTo(0)));
assertThat(systemOut.getLog(), containsString("does not exist"));
assertThat(systemOut.getLog(), containsString("No such file or directory"));
}

// TODO: uncomment once JFR can do something about timeouts internally
Expand Down

0 comments on commit 8062dd6

Please sign in to comment.