Require 2.479.1 or newer

Author: strangelookingnerd

.github/workflows/ci.yml

@@ -17,10 +17,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build with Maven
         run: mvn -B -Dgpg.skip jacoco:prepare-agent verify jacoco:report
       - name: Upload code coverage

Jenkinsfile

@@ -1,4 +1,12 @@
-buildPlugin(useContainerAgent: true, timeout: 180, configurations: [
-    [platform: 'linux', jdk: 17],
-    [platform: 'windows', jdk: 11],
-])
+/*
+ See the documentation for more options:
+ https://github.com/jenkins-infra/pipeline-library/
+*/
+buildPlugin(
+  forkCount: '1C', // run this number of tests in parallel for faster feedback.  If the number terminates with a 'C', the value will be multiplied by the number of available CPU cores
+  useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
+  timeout: 180,
+  configurations: [
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 17],
+])

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.60</version>
+        <version>5.9</version>
         <relativePath />
     </parent>
     <groupId>io.jenkins.plugins</groupId>
@@ -13,8 +13,9 @@
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin/blob/main/README.md</url>
     <packaging>hpi</packaging>
     <properties>
-        <jenkins.version>2.375.4</jenkins.version>
-        <junit.junit.version>5.8.0</junit.junit.version>
+        <jenkins.baseline>2.479</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+        <junit.junit.version>5.12.1</junit.junit.version>
         <jacoco.version>0.8.7</jacoco.version>
     </properties>
     <name>Multiselect parameter</name>

src/main/java/de/westemeyer/plugins/multiselect/MultiselectParameterDefinition.java

@@ -11,7 +11,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 import org.kohsuke.stapler.verb.POST;
 
@@ -149,7 +149,7 @@ public ParameterValue getDefaultParameterValue() {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest staplerRequest, JSONObject jsonObject) {
+    public ParameterValue createValue(StaplerRequest2 staplerRequest, JSONObject jsonObject) {
         return createValue(jsonObject);
     }
 
@@ -187,7 +187,7 @@ public MultiselectParameterValue createValue(Map<String, Object> jsonObject) {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest staplerRequest) {
+    public ParameterValue createValue(StaplerRequest2 staplerRequest) {
         return getDefaultParameterValue();
     }
 
@@ -277,7 +277,7 @@ public String getDisplayName() {
         }
 
         @Override
-        public ParameterDefinition newInstance(@Nullable StaplerRequest req, @Nonnull JSONObject formData) {
+        public ParameterDefinition newInstance(@Nullable StaplerRequest2 req, @Nonnull JSONObject formData) {
             // currently only CSV configuration format is implemented
             MultiselectConfigurationFormat format = MultiselectConfigurationFormat.CSV;
 

src/test/java/de/westemeyer/plugins/multiselect/MultiselectParameterDefinitionTest.java

@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -119,7 +119,7 @@ void getDefaultParameterValue() {
     @Test
     void createValue() {
         MultiselectParameterDefinition definition = new MultiselectParameterDefinition(NAME, DESCRIPTION, INPUT, CSV);
-        ParameterValue defaultParameterValue = definition.createValue((StaplerRequest) null);
+        ParameterValue defaultParameterValue = definition.createValue((StaplerRequest2) null);
         assertNotNull(defaultParameterValue);
         assertEquals(NAME, defaultParameterValue.getName());
         Object parameterValueContent = defaultParameterValue.getValue();
@@ -134,7 +134,7 @@ void createValue() {
         values.put("name", "Hugo");
         values.put("integer", 1);
         values.put("empty", "");
-        MultiselectParameterValue value = (MultiselectParameterValue) definition.createValue(null, values);
+        MultiselectParameterValue value = (MultiselectParameterValue) definition.createValue((StaplerRequest2) null, values);
         assertNotNull(value);
         EnvVars vars = new EnvVars();
         value.buildEnvironment(null, vars);
@@ -190,7 +190,7 @@ void newInstance() {
         jsonObject.put("name", "parametername");
         jsonObject.put("description", DESCRIPTION);
         MultiselectParameterDefinition.DescriptorImpl descriptor = new MultiselectParameterDefinition.DescriptorImpl();
-        MultiselectParameterDefinition parameterDefinition = (MultiselectParameterDefinition) descriptor.newInstance(null, jsonObject);
+        MultiselectParameterDefinition parameterDefinition = (MultiselectParameterDefinition) descriptor.newInstance((StaplerRequest2) null, jsonObject);
         MultiselectDecisionTree decisionTree = parameterDefinition.getDecisionTree();
         assertNotNull(decisionTree);
         assertEquals(definition.getDecisionTree().toString(), decisionTree.toString());