From 1ad7b96dbbbac97c5537a7d9ef522ca4b8eea370 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Thu, 26 Aug 2021 12:12:26 +0200
Subject: [PATCH] Update Jenkins core to 2.303.1 + update to recent Eclipse
 Jetty and Plugin BOM

---
 pom.xml                                                   | 8 ++++----
 .../io/jenkins/jenkinsfile/runner/vanilla/SmokeTest.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index b5f8ca0..d87ecaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/vanilla-package/src/test/java/io/jenkins/jenkinsfile/runner/vanilla/SmokeTest.java b/vanilla-package/src/test/java/io/jenkins/jenkinsfile/runner/vanilla/SmokeTest.java
index ff6f9f8..aa66977 100644
--- a/vanilla-package/src/test/java/io/jenkins/jenkinsfile/runner/vanilla/SmokeTest.java
+++ b/vanilla-package/src/test/java/io/jenkins/jenkinsfile/runner/vanilla/SmokeTest.java
@@ -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