From f66458b11fe965e2b321dd4e8aa52ac74a31b56c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 21:53:13 +0000 Subject: [PATCH 1/4] Bump groovy from 1.9 to 2.2 Bumps [groovy](https://github.com/jenkinsci/groovy-plugin) from 1.9 to 2.2. - [Release notes](https://github.com/jenkinsci/groovy-plugin/releases) - [Changelog](https://github.com/jenkinsci/groovy-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/groovy-plugin/compare/groovy-1.9...groovy-2.2) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:groovy dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af32800..f8b1e3c 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ org.jenkins-ci.plugins groovy - 1.9 + 2.2 true From b7de69267de9ed1b2243200474b3b190c4bf648f Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Wed, 7 Dec 2022 09:38:26 +0100 Subject: [PATCH 2/4] chore(jdk) Move to JDK11 --- Jenkinsfile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6cd0468..57e692b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,16 @@ // Builds the plugin using https://github.com/jenkins-infra/pipeline-library -buildPlugin(/**TODO: Update Plugin POM: buildPlugin.recommendedConfigurations()**/) +buildPlugin( + // Container agents start faster and are easier to administer + useContainerAgent: true, + // Show failures on all configurations + failFast: false, + // Opt-in to the Artifact Caching Proxy, to be removed when it will be opt-out. + // See https://github.com/jenkins-infra/helpdesk/issues/2752 for more details and updates. + artifactCachingProxyEnabled: true, + // Test Java 11 with a recent LTS, Java 17 even more recent + configurations: [ + [platform: 'linux', jdk: '17', jenkins: '2.380'], + [platform: 'linux', jdk: '11', jenkins: '2.375.1'], + [platform: 'windows', jdk: '11'] + ] +) From 6ef5178dac24053539c3b813d03cc2fbb3dd750e Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Wed, 7 Dec 2022 09:51:48 +0100 Subject: [PATCH 3/4] fix(comments) Where does my build definition comes from? --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 70492af..138ffa5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,6 @@ #!/usr/bin/env groovy +/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */ buildPlugin( // Container agents start faster and are easier to administer useContainerAgent: true, From 74edbfcc1dbbaeda7d74c079e4a69a101bebd264 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 16 Mar 2023 09:02:41 -0600 Subject: [PATCH 4/4] Adapt to newer Jenkins groovy plugin --- src/main/java/configurationslicing/tools/GroovySlicer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/configurationslicing/tools/GroovySlicer.java b/src/main/java/configurationslicing/tools/GroovySlicer.java index 907e4af..ea39cd0 100644 --- a/src/main/java/configurationslicing/tools/GroovySlicer.java +++ b/src/main/java/configurationslicing/tools/GroovySlicer.java @@ -3,6 +3,7 @@ import hudson.plugins.groovy.Groovy; import hudson.tasks.Builder; import hudson.tools.ToolInstallation; +import jenkins.model.Jenkins; /** * @author Maarten Dirkse @@ -54,7 +55,7 @@ protected String getToolName(Builder builder) { @Override protected ToolInstallation[] getToolInstallations() { - return Groovy.DESCRIPTOR.getInstallations(); + return Jenkins.get().getDescriptorByType(Groovy.DescriptorImpl.class).getInstallations(); } } -} \ No newline at end of file +}