From 4bbdb4cb3f90c7b458e3e478680e5441b41d6ef4 Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Thu, 4 May 2023 14:26:41 +0100
Subject: [PATCH 1/2] update jenkins baseline, move to java11

---
 Jenkinsfile | 8 +++-----
 pom.xml     | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 325fc0b9..05924805 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,8 +1,6 @@
 buildPlugin(configurations: [
         // Test Windows & Linux with default values
-        [ platform: "linux", jdk: "8", jenkins: null ],
-        [ platform: "windows", jdk: "8", jenkins: null ],
-
-        // Checking JDK 11
-        [ platform: "linux", jdk: "11", jenkins: null ]
+        [ platform: "linux", jdk: "11" ],
+        [ platform: "windows", jdk: "11"],
+        [ platform: "linux", jdk: "17"]
 ])
diff --git a/pom.xml b/pom.xml
index 2d3354f2..c27a14b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,13 +14,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.47</version>
+    <version>4.62</version>
     <relativePath/>
   </parent>
 
@@ -65,7 +65,7 @@
   <properties>
     <revision>1.5.7</revision>
     <changelist>-SNAPSHOT</changelist>
-    <jenkins.version>2.319.3</jenkins.version>
+    <jenkins.version>2.361.4</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
     <hpi.compatibleSinceVersion>1.5.0</hpi.compatibleSinceVersion>
     <google.api.version>1.35.2</google.api.version>

From 7c335903c77b27352151c2eaa90f32a77dcf454d Mon Sep 17 00:00:00 2001
From: James Nord <jtnord@users.noreply.github.com>
Date: Thu, 4 May 2023 14:59:40 +0100
Subject: [PATCH 2/2] remove java17 until it is fixed

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 05924805..0017bffd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,5 +2,5 @@ buildPlugin(configurations: [
         // Test Windows & Linux with default values
         [ platform: "linux", jdk: "11" ],
         [ platform: "windows", jdk: "11"],
-        [ platform: "linux", jdk: "17"]
+        //[ platform: "linux", jdk: "17"]
 ])