Bump bom-2.332.x from 1466.v85a_616ea_b_87c to 1763.v092b_8980a_f5e

.github/dependabot.yml

@@ -1,8 +1,12 @@
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
   - package-ecosystem: "maven"
     directory: "/"
-    reviewers:
-      - "dwnusbaum"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/release-drafter.yml

@@ -0,0 +1 @@
+_extends: .github

.github/workflows/cd.yaml

@@ -0,0 +1,15 @@
+# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins
+
+name: cd
+on:
+  workflow_dispatch:
+  check_run:
+    types:
+      - completed
+
+jobs:
+  maven-cd:
+    uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
+    secrets:
+      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+      MAVEN_TOKEN: ${{ secrets.MAVEN_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.4</version>
   </extension>
 </extensions>

.mvn/maven.config

@@ -1,2 +1,3 @@
 -Pconsume-incrementals
 -Pmight-produce-incrementals
+-Dchangelist.format=%d.v%s

Jenkinsfile

@@ -1 +1,5 @@
-buildPlugin()
+buildPlugin(useContainerAgent: true, configurations: [
+  [ platform: "linux", jdk: "8" ],
+  [ platform: "windows", jdk: "8" ],
+  [ platform: "linux", jdk: "11" ]
+])

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013-2021 CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,7 +1,7 @@
 # Pipeline API Plugin
 
 [![Jenkins Plugin](https://img.shields.io/jenkins/plugin/v/workflow-api)](https://plugins.jenkins.io/workflow-api)
-[![Changelog](https://img.shields.io/github/v/tag/jenkinsci/workflow-api-plugin?label=changelog)](https://github.com/jenkinsci/workflow-api-plugin/blob/master/CHANGELOG.md)
+[![GitHub Release](https://img.shields.io/github/v/tag/jenkinsci/workflow-api-plugin?label=changelog)](https://github.com/jenkinsci/workflow-api-plugin/releases/latest)
 [![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/workflow-api?color=blue)](https://plugins.jenkins.io/workflow-api)
 
 # Introduction
@@ -10,3 +10,8 @@ Plugin that defines Pipeline API.
 
 A component of [Pipeline
 Plugin](https://plugins.jenkins.io/workflow-aggregator).
+
+# Changelog
+
+* For new versions, see [GitHub Releases](https://github.com/jenkinsci/workflow-api-plugin/releases)
+* For versions 2.41 and older, see the [CHANGELOG](https://github.com/jenkinsci/workflow-api-plugin/blob/master/CHANGELOG.md)

docs/flowgraph.md

@@ -2,7 +2,7 @@
 
 The "Flow Graph" is how Pipeline stores structural information about Pipelines that have run or *are* running -- this is used for visualization and runtime activities. You won't find any class with this name but we refer to it like this because it's the best terminology we have.  "Flow" because originally the plugin was Workflow, and describing it as a flow reminds us that execution is a directional process with a start and end, "graph" because the data is structured as a directed acyclic graph to allow for parallel execution.
 
-This stucture describes all possible Pipelines, whether a simple set of steps, or a complex set of nested parallels, and is designed to grow at runtime as the Pipeline executes. This also means that for a running Pipeline it will be in an incomplete state, with un-terminated blocks.
+This structure describes all possible Pipelines, whether a simple set of steps, or a complex set of nested parallels, and is designed to grow at runtime as the Pipeline executes. This also means that for a running Pipeline it will be in an incomplete state, with un-terminated blocks.
 
 # Concepts
 
@@ -12,8 +12,8 @@ This may seem backwards, but it enables us to freely append to the Flow Graph as
 
 **Key information is stored in a couple ways:**
 
-* The specific subclass of the `FlowNode` used for a particular node is structurally imporant - for example `BlockStartNode` represents the start of a block
-* `StepDescriptor`: most `FlowNode`s come from running `Steps` and implement `StepNode`. This means they you can get the `StepDescriptor` to determine their `Step` that produced them.
+* The specific subclass of the `FlowNode` used for a particular node is structurally important - for example `BlockStartNode` represents the start of a block
+* `StepDescriptor`: most `FlowNode`s come from running `Steps` and implement `StepNode`. This means they can get the `StepDescriptor` to determine their `Step` that produced them.
 * Parent relationships allow us to so split into parallel branches and track them independently.  We may have multiple nodes with a given parent (at the start of a parallel) or one node with multiple parents (the end of a parallel)
 * `Action`s give us all the key attributes of the `FlowNode`, see the section below for a quick reference
 
@@ -75,12 +75,12 @@ This may seem backwards, but it enables us to freely append to the Flow Graph as
 * **There are no bounds on the size of the flow graph, it may have thousands of nodes in it.**  Real users with complex Pipelines will really generate graphs this size.  Yes, really.  
 * **Repeat: there are no bounds on the size of the flow graph.  This means if you use recursive function calls to iterate over the Flow Graph you will get a `StackOverFlowError`!!!**  Use the `AbstractFlowScanner` implementations - they're free of stack overflows and well-tested.
 * As a back of napkin estimate, most Flow Graphs fall in the 200-700 `FlowNode` range
-* `GraphListener` gotcha: because the listener is invoked for each new `FlowNode`, if you implement some operation that iterates over a lot of the Flow Graph then you've just done an O(n^2) operation and it can result in very high CPU use.  This can bog down a Jenkins master if not done carefully.
+* `GraphListener` gotcha: because the listener is invoked for each new `FlowNode`, if you implement some operation that iterates over a lot of the Flow Graph then you've just done an O(n^2) operation and it can result in very high CPU use.  This can bog down a Jenkins controller if not done carefully.
     - Careful use of the methods above to iterate/find enclosing flownodes can make this much safer
 
 
 # Anti-gotchas
 
 * It may seem intimidating but the Flow Graph has a TON of useful information ripe for analysis and visualization!
 * The gotchas above are mostly a problem for plugins that try to manipulate the Flow Graph or do automated analysis while Pipelines are running -- if you use the utilities and wait for Pipelines to complete then most of the problems go away.
-* The actual data model is quite simple.
+* The actual data model is quite simple.

pom.xml

@@ -23,17 +23,17 @@
   ~ THE SOFTWARE.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>plugin</artifactId>
-        <version>4.16</version>
-        <relativePath />
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>plugin</artifactId>
+      <version>4.48</version>
+      <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
     <artifactId>workflow-api</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>${changelist}</version>
     <packaging>hpi</packaging>
     <name>Pipeline: API</name>
     <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
@@ -44,9 +44,9 @@
         </license>
     </licenses>
     <scm>
-        <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
-        <developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
-        <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
+        <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
+        <url>https://github.com/${gitHubRepo}</url>
         <tag>${scmTag}</tag>
     </scm>
     <repositories>
@@ -62,19 +62,18 @@
         </pluginRepository>
     </pluginRepositories>
     <properties>
-        <revision>2.42</revision>
-        <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.176.4</jenkins.version>
-        <java.level>8</java.level>
+        <changelist>999999-SNAPSHOT</changelist>
+        <jenkins.version>2.332.1</jenkins.version>
         <no-test-jar>false</no-test-jar>
         <useBeta>true</useBeta>
+        <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.176.x</artifactId>
-                <version>16</version>
+                <artifactId>bom-2.332.x</artifactId>
+                <version>1763.v092b_8980a_f5e</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -119,7 +118,7 @@
         <dependency>
             <groupId>org.jenkins-ci.test</groupId>
             <artifactId>docker-fixtures</artifactId>
-            <version>1.10</version>
+            <version>166.v912b_95083ffe</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/org/jenkinsci/plugins/workflow/FilePathUtils.java

@@ -32,15 +32,14 @@
 import hudson.remoting.Channel;
 import hudson.remoting.VirtualChannel;
 import hudson.slaves.ComputerListener;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -63,24 +62,24 @@ public class FilePathUtils {
      * Note that if an administrator disconnects an agent, configures and connects an unrelated agent with the same name,
      * and then this method is called on a path created against the original connection, the result may be misleading.
      * @param f a file, possibly remote
-     * @return a node name ({@code ""} for master), if known, else null
+     * @return a node name ({@code ""} for the controller), if known, else null
      */
-    public static @CheckForNull String getNodeNameOrNull(@Nonnull FilePath f) {
+    public static @CheckForNull String getNodeNameOrNull(@NonNull FilePath f) {
         return Listener.getChannelName(f.getChannel());
     }
 
     /**
      * Same as {@link #getNodeNameOrNull} but throws a diagnostic exception in case of failure.
      * @param f a file, possible remote
-     * @return a node name ({@code ""} for master), if known
+     * @return a node name ({@code ""} for the controller), if known
      * @throws IllegalStateException if the association to a node is unknown
      */
-    public static @Nonnull String getNodeName(@Nonnull FilePath f) throws IllegalStateException {
+    public static @NonNull String getNodeName(@NonNull FilePath f) throws IllegalStateException {
         String name = getNodeNameOrNull(f);
         if (name != null) {
             return name;
         } else {
-            throw new IllegalStateException("no known slave for " + f + " among " + Listener.getChannelNames());
+            throw new IllegalStateException("no known agent for " + f + " among " + Listener.getChannelNames());
         }
     }
 
@@ -90,7 +89,7 @@ public class FilePathUtils {
      * @param path a path as returned by {@link FilePath#getRemote}
      * @return a corresponding file handle, if a node with that name is online, else null
      */
-    public static @CheckForNull FilePath find(@Nonnull String node, @Nonnull String path) {
+    public static @CheckForNull FilePath find(@NonNull String node, @NonNull String path) {
         Jenkins j = Jenkins.getInstanceOrNull();
         if (j == null) {
             return null;
@@ -113,7 +112,7 @@ private FilePathUtils() {}
 
         private static final Map<VirtualChannel,String> channelNames = Collections.synchronizedMap(new WeakHashMap<>());
 
-        static String getChannelName(@Nonnull VirtualChannel channel) {
+        static String getChannelName(@NonNull VirtualChannel channel) {
             String channelName = channelNames.get(channel);
 
             if (channelName == null) {
@@ -143,7 +142,7 @@ static Collection<String> getChannelNames() {
                 addChannel(c.getChannel(), c.getName());
             }
         }
-        @Override public void preOnline(Computer c, Channel channel, FilePath root, TaskListener listener) throws IOException, InterruptedException {
+        @Override public void preOnline(Computer c, Channel channel, FilePath root, TaskListener listener) {
             addChannel(channel, c.getName());
         }