diff --git a/Jenkinsfile b/Jenkinsfile index 4c44a05..021a06f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,7 @@ -buildPlugin(jenkinsVersions: [null, "2.249.2"], timeout: 180) +buildPlugin( + forkCount: '1C', + useContainerAgent: true, + configurations: [ + [platform: 'linux', jdk: 21], + [platform: 'windows', jdk: 17], +]) \ No newline at end of file diff --git a/pom.xml b/pom.xml index cbd2303..0ca2635 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 3.18 + 4.64 io.jenkins.plugins @@ -12,8 +12,7 @@ 1.2-SNAPSHOT hpi - 2.60.3 - 8 + 2.414.3 true true @@ -54,11 +53,21 @@ https://repo.jenkins-ci.org/public/ + + + + io.jenkins.tools.bom + bom-2.414.x + 2643.vfa_93ff299d20 + import + pom + + + io.jenkins configuration-as-code - 1.0 diff --git a/src/main/java/io/jenkins/plugins/cascgroovy/GroovyScriptCaller.java b/src/main/java/io/jenkins/plugins/cascgroovy/GroovyScriptCaller.java index fbd9312..9e8c9d9 100644 --- a/src/main/java/io/jenkins/plugins/cascgroovy/GroovyScriptCaller.java +++ b/src/main/java/io/jenkins/plugins/cascgroovy/GroovyScriptCaller.java @@ -99,7 +99,7 @@ public Boolean[] check(CNode config, ConfigurationContext context) throws Config @Nonnull @Override - public List getConfigurators(ConfigurationContext context) { + public List> getConfigurators(ConfigurationContext context) { return Collections.singletonList(context.lookup(GroovyScriptSource.class)); }