Require 2.452.4 and fix build (#327)

Author: jonesbusy

Jenkinsfile

@@ -1,4 +1,11 @@
-buildPlugin(useContainerAgent: false, configurations: [
-  [platform: 'linux', jdk: 21],
-  [platform: 'maven-17-windows', jdk: 17] // TODO Docker-based tests fail when using Docker on Windows. The maven-windows agents do not have Docker installed so tests that require Docker are skipped.
+/*
+ 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: false, // Set to `false` if you need to use Docker for containerized tests
+  configurations: [
+    [platform: 'linux', jdk: 21],
+    [platform: 'maven-17-windows', jdk: 17], // TODO Docker-based tests fail when using Docker on Windows. The maven-windows agents do not have Docker installed so tests that require Docker are skipped.
 ])

pom.xml

@@ -4,8 +4,8 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.86</version>
-        <relativePath />
+        <version>4.88</version>
+        <relativePath/>
     </parent>
     <artifactId>docker-workflow</artifactId>
     <version>${changelist}</version>
@@ -31,8 +31,8 @@
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <jenkins.baseline>2.361</jenkins.baseline>
-        <jenkins.version>${jenkins.baseline}.4</jenkins.version>
+        <jenkins.baseline>2.452</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.4</jenkins.version>        
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
     <repositories>
@@ -52,7 +52,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>2102.v854b_fec19c92</version>
+                <version>3893.v213a_42768d35</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

src/test/java/org/jenkinsci/plugins/docker/workflow/declarative/DeclarativeDockerUtilsTest.java

@@ -33,6 +33,7 @@
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
 import hudson.ExtensionList;
 import hudson.Functions;
+import hudson.model.Descriptor.FormException;
 import hudson.model.Slave;
 import org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryEndpoint;
 import org.jenkinsci.plugins.docker.workflow.DockerTestUtil;
@@ -51,12 +52,23 @@
  * And related configurations like {@link DockerPropertiesProvider}.
  */
 public class DeclarativeDockerUtilsTest extends AbstractModelDefTest {
-    private static final UsernamePasswordCredentialsImpl globalCred = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL,
-            "globalCreds", "sample", "bobby", "s3cr37");
-    private static final UsernamePasswordCredentialsImpl folderCred = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL,
-            "folderCreds", "other sample", "andrew", "s0mething");
-    private static final UsernamePasswordCredentialsImpl grandParentCred = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL,
-            "grandParentCreds", "yet another sample", "leopold", "idunno");
+
+    private static final UsernamePasswordCredentialsImpl globalCred;
+    private static final UsernamePasswordCredentialsImpl folderCred;
+    private static final UsernamePasswordCredentialsImpl grandParentCred;
+
+    static {
+        try {
+            globalCred = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL,
+                    "globalCreds", "sample", "bobby", "s3cr37");
+            folderCred = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL,
+                    "folderCreds", "other sample", "andrew", "s0mething");
+            grandParentCred = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL,
+                    "grandParentCreds", "yet another sample", "leopold", "idunno");
+        } catch (FormException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     @BeforeClass
     public static void setup() throws Exception {

src/test/resources/org/jenkinsci/plugins/docker/workflow/agent-with-docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/agent:4.10-5-jdk11
+FROM jenkins/agent:3206.3208.v409508a_675ff-1-jdk17
 USER root
 RUN cat /etc/os-release
 # TODO https://github.com/moby/moby/issues/15717 alas; no curl or wget in image