From ecc0afe8b025524eccea704a12cc2703d8df3e59 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Fri, 19 May 2023 14:23:59 -0700 Subject: [PATCH 1/2] Modernize plugin --- Jenkinsfile | 10 +++------- pom.xml | 8 ++++---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6f681cb..8d38b97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,4 @@ -buildPlugin(configurations: [ - [platform: 'linux', jdk: '8'], - [platform: 'linux', jdk: '11'], - [platform: 'windows', jdk: '11'], - - // More recent with Guava & Guice bumps, only Linux - [ platform: "linux", jdk: "8", jenkins: '2.324' ], +buildPlugin(useContainerAgent: true, configurations: [ + [platform: 'linux', jdk: 17], + [platform: 'windows', jdk: 11], ]) diff --git a/pom.xml b/pom.xml index fe30fab..84d7866 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 4.49 + 4.63 antisamy-markup-formatter ${changelist} @@ -27,7 +27,7 @@ 999999-SNAPSHOT jenkinsci/antisamy-markup-formatter-plugin - 2.277.4 + 2.361.4 2.0 @@ -47,8 +47,8 @@ io.jenkins.tools.bom - bom-2.277.x - 961.vf0c9f6f59827 + bom-2.361.x + 2081.v85885a_d2e5c5 import pom From 58ce8c0c97125f6fc835c0e29eac532ac4415f85 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 3 Aug 2023 10:23:44 -0700 Subject: [PATCH 2/2] More updates --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 84d7866..ef8b343 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 4.63 + 4.71 antisamy-markup-formatter ${changelist} @@ -27,7 +27,7 @@ 999999-SNAPSHOT jenkinsci/antisamy-markup-formatter-plugin - 2.361.4 + 2.387.3 2.0 @@ -47,8 +47,8 @@ io.jenkins.tools.bom - bom-2.361.x - 2081.v85885a_d2e5c5 + bom-2.387.x + 2278.v47b_4508e256a import pom