Merge branch 'master' of https://github.com/jenkinsci/docker-workflow-plugin into CustomDescribableModel-JENKINS-44892

Author: jglick

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/release-drafter.yml

@@ -0,0 +1,17 @@
+# Note: additional setup is required, see https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
+
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into the default branch
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.0-beta-4</version>
+    <version>1.3</version>
   </extension>
 </extensions>

pom.xml

@@ -29,12 +29,12 @@
     </scm>
 
     <properties>
-        <revision>1.27</revision>
+        <revision>1.30</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.190.3</jenkins.version>
+        <jenkins.version>2.332.1</jenkins.version>
         <java.level>8</java.level>
         <useBeta>true</useBeta> <!-- TODO pending release of https://github.com/jenkinsci/structs-plugin/pull/65 -->
-        <pipeline-model-definition-plugin.version>1.8.1</pipeline-model-definition-plugin.version>
+        <pipeline-model-definition-plugin.version>2.2097.v33db_b_de764b_e</pipeline-model-definition-plugin.version> <!-- TODO: Delete this and related dependencyManagement entries once this version is included in BOM -->
     </properties>
     <repositories>
         <repository>
@@ -52,49 +52,33 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.190.x</artifactId>
-                <version>14</version>
+                <artifactId>bom-2.332.x</artifactId>
+                <version>1409.v7659b_c072f18</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency> <!-- TODO until we are on 2.222.x and can use bom 22+ -->
-                <groupId>org.jenkinsci.plugins</groupId>
-                <artifactId>pipeline-model-api</artifactId>
-                <version>${pipeline-model-definition-plugin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkinsci.plugins</groupId>
-                <artifactId>pipeline-model-definition</artifactId>
-                <version>${pipeline-model-definition-plugin.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jenkinsci.plugins</groupId>
-                <artifactId>pipeline-model-definition</artifactId>
-                <classifier>tests</classifier>
+                <artifactId>pipeline-model-api</artifactId>
                 <version>${pipeline-model-definition-plugin.version}</version>
             </dependency>
-            <dependency>
+             <dependency>
                 <groupId>org.jenkinsci.plugins</groupId>
                 <artifactId>pipeline-model-extensions</artifactId>
                 <version>${pipeline-model-definition-plugin.version}</version>
             </dependency>
-            <dependency>
+             <dependency>
                 <groupId>org.jenkinsci.plugins</groupId>
                 <artifactId>pipeline-stage-tags-metadata</artifactId>
                 <version>${pipeline-model-definition-plugin.version}</version>
             </dependency>
-            <dependency> <!-- TODO bom problem -->
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>jackson2-api</artifactId>
-                <scope>test</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>docker-commons</artifactId>
-            <version>1.14</version>
+            <version>1.19</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -147,12 +131,12 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>config-file-provider</artifactId>
-            <version>2.10.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkinsci.plugins</groupId>
             <artifactId>pipeline-model-definition</artifactId>
+            <version>${pipeline-model-definition-plugin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -174,6 +158,7 @@
         <dependency>
             <groupId>org.jenkinsci.plugins</groupId>
             <artifactId>pipeline-model-definition</artifactId>
+            <version>${pipeline-model-definition-plugin.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>

src/main/java/org/jenkinsci/plugins/docker/workflow/AbstractEndpointStepExecution.java

@@ -23,6 +23,7 @@
  */
 package org.jenkinsci.plugins.docker.workflow;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.EnvVars;
 import java.io.IOException;
 import java.util.logging.Level;
@@ -48,7 +49,7 @@ protected KeyMaterialFactory newKeyMaterialFactory() throws IOException, Interru
         throw new AssertionError();
     }
 
-    @Override public final void stop(Throwable cause) throws Exception {
+    @Override public final void stop(@NonNull Throwable cause) throws Exception {
         // should not need to do anything special
     }
 

src/main/java/org/jenkinsci/plugins/docker/workflow/DockerDSL.java

@@ -23,20 +23,24 @@
  */
 package org.jenkinsci.plugins.docker.workflow;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import groovy.lang.Binding;
 import hudson.Extension;
 import org.jenkinsci.plugins.workflow.cps.CpsScript;
 import org.jenkinsci.plugins.workflow.cps.GlobalVariable;
+import org.jenkinsci.plugins.workflow.cps.GroovySourceFileAllowlist;
 
 /**
  * Something you should <strong>not copy</strong>. Write plain old {@code Step}s and leave it at that.
  */
 @Extension public class DockerDSL extends GlobalVariable {
 
+    @NonNull
     @Override public String getName() {
         return "docker";
     }
 
+    @NonNull
     @Override public Object getValue(CpsScript script) throws Exception {
         Binding binding = script.getBinding();
         Object docker;
@@ -50,4 +54,13 @@
         return docker;
     }
 
+    @Extension
+    public static class DockerDSLAllowlist extends GroovySourceFileAllowlist {
+        private final String scriptUrl = DockerDSL.class.getResource("Docker.groovy").toString();
+
+        @Override
+        public boolean isAllowed(String groovyResourceUrl) {
+            return groovyResourceUrl.equals(scriptUrl);
+        }
+    }
 }

src/main/java/org/jenkinsci/plugins/docker/workflow/FromFingerprintStep.java

@@ -26,6 +26,7 @@
 import java.util.Map;
 
 import com.google.inject.Inject;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.AbortException;
 import hudson.EnvVars;
 import hudson.Extension;
@@ -133,6 +134,7 @@ public DescriptorImpl() {
             return "dockerFingerprintFrom";
         }
 
+        @NonNull
         @Override public String getDisplayName() {
             return "Record trace of a Docker image used in FROM";
         }

src/main/java/org/jenkinsci/plugins/docker/workflow/ImageAction.java

@@ -23,6 +23,7 @@
  */
 package org.jenkinsci.plugins.docker.workflow;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.BulkChange;
 import hudson.Extension;
 import hudson.model.InvisibleAction;
@@ -70,6 +71,7 @@ static void add(String image, Run<?,?> run) throws IOException {
 
     @Extension public static final class ExtractorImpl extends DockerImageExtractor {
 
+        @NonNull
         @Override public Collection<String> getDockerImagesUsedByJob(Job<?,?> job) {
             Run<?,?> build = job.getLastCompletedBuild();
             if (build != null) {

src/main/java/org/jenkinsci/plugins/docker/workflow/ImageNameTokens.java

@@ -23,7 +23,8 @@
  */
 package org.jenkinsci.plugins.docker.workflow;
 
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 import java.io.Serializable;
 
 /**
@@ -43,7 +44,7 @@ public class ImageNameTokens implements Serializable {
     public final String userAndRepo;
     public final String tag;
 
-    public ImageNameTokens(@Nonnull String name) {
+    public ImageNameTokens(@NonNull String name) {
         int tagIdx = name.lastIndexOf(':');
         if (tagIdx != -1) {
             this.userAndRepo = name.substring(0, tagIdx);

src/main/java/org/jenkinsci/plugins/docker/workflow/RegistryEndpointStep.java

@@ -24,6 +24,8 @@
 package org.jenkinsci.plugins.docker.workflow;
 
 import com.google.common.collect.ImmutableSet;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
@@ -35,10 +37,9 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
 import org.jenkinsci.plugins.docker.commons.credentials.DockerRegistryEndpoint;
 import org.jenkinsci.plugins.docker.commons.credentials.KeyMaterialFactory;
 import org.jenkinsci.plugins.docker.commons.tools.DockerTool;
@@ -53,18 +54,19 @@
 
 public class RegistryEndpointStep extends Step {
 
-    private final @Nonnull DockerRegistryEndpoint registry;
+    private final @NonNull DockerRegistryEndpoint registry;
     private @CheckForNull String toolName;
 
-    @DataBoundConstructor public RegistryEndpointStep(@Nonnull DockerRegistryEndpoint registry) {
-        assert registry != null;
-        this.registry = registry;
+    @DataBoundConstructor public RegistryEndpointStep(@NonNull DockerRegistryEndpoint registry) {
+        this.registry = Objects.requireNonNull(registry, "registry must not be null");;
     }
-    
+
+    @NonNull
     public DockerRegistryEndpoint getRegistry() {
         return registry;
     }
 
+    @CheckForNull
     public String getToolName() {
         return toolName;
     }
@@ -111,6 +113,7 @@ public static class Execution extends AbstractEndpointStepExecution {
             return "withDockerRegistry";
         }
 
+        @NonNull
         @Override public String getDisplayName() {
             return "Sets up Docker registry endpoint";
         }