From cd15a1a6a089da04bc8e7b32dc8c0ccdc9d33a38 Mon Sep 17 00:00:00 2001 From: Steve Hill Date: Sat, 17 Jun 2023 16:13:37 -0700 Subject: [PATCH 1/2] Upgrade POM parent to 4.67 - Requires Java 11 - Requires Jenkins 2.346.4 - Builds on Java 11 and 17 --- Jenkinsfile | 6 +++++- pom.xml | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a229fa51..4f0ea407 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,5 @@ -buildPlugin() +buildPlugin(useContainerAgent: true, configurations: [ + [ platform: 'linux', jdk: '11' ], + [ platform: 'windows', jdk: '11' ], + [ platform: 'linux', jdk: '17' ], +]) diff --git a/pom.xml b/pom.xml index 38c1e6a4..33c3a1cc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 4.40 + 4.67 hpi @@ -11,8 +11,7 @@ 1.29 -SNAPSHOT - 2.303.1 - 8 + 2.361.4 1.9 stashNotifier @@ -81,8 +80,8 @@ io.jenkins.tools.bom - bom-2.303.x - 1382.v7d694476f340 + bom-2.361.x + 2102.v854b_fec19c92 import pom @@ -120,7 +119,7 @@ org.mockito - mockito-inline + mockito-core test From 1732b9c7fbb4ad6166183fa9ae2f3719dd264a89 Mon Sep 17 00:00:00 2001 From: Steve Hill Date: Sat, 5 Aug 2023 19:15:36 -0700 Subject: [PATCH 2/2] Modernize to latest versions supported by Java 8 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 33c3a1cc..2f6e2671 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 4.67 + 4.51 hpi @@ -11,7 +11,7 @@ 1.29 -SNAPSHOT - 2.361.4 + 2.346.3 1.9 stashNotifier @@ -80,8 +80,8 @@ io.jenkins.tools.bom - bom-2.361.x - 2102.v854b_fec19c92 + bom-2.346.x + 1763.v092b_8980a_f5e import pom @@ -119,7 +119,7 @@ org.mockito - mockito-core + mockito-inline test