Merge branch 'master' of https://github.com/jenkinsci/workflow-support-plugin into DefaultStepContext

Author: jglick

.github/workflows/jenkins-security-scan.yml

@@ -0,0 +1,21 @@
+name: Jenkins Security Scan
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+  workflow_dispatch:
+
+permissions:
+  security-events: write
+  contents: read
+  actions: read
+
+jobs:
+  security-scan:
+    uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
+    with:
+      java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
+      # java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.7</version>
+    <version>1.8</version>
   </extension>
 </extensions>

pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.77</version>
+        <version>4.88</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -63,7 +63,7 @@
     </pluginRepositories>
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <jenkins.version>2.387.3</jenkins.version>
+        <jenkins.version>2.440.3</jenkins.version>
         <no-test-jar>false</no-test-jar>
         <useBeta>true</useBeta>
         <hpi.compatibleSinceVersion>3.0</hpi.compatibleSinceVersion>
@@ -73,8 +73,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.387.x</artifactId>
-                <version>2163.v2d916d90c305</version>
+                <artifactId>bom-2.440.x</artifactId>
+                <version>3234.v5ca_5154341ef</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -105,7 +105,7 @@
             <!-- Required for running with Java 9+ -->
             <groupId>org.jboss.marshalling</groupId>
             <artifactId>jboss-marshalling-river</artifactId>
-            <version>2.1.3.Final</version>
+            <version>2.2.1.Final</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>

src/main/java/org/jenkinsci/plugins/workflow/support/DefaultStepContext.java

@@ -151,8 +151,11 @@ private synchronized TaskListener getListener(boolean allowInactive) throws IOEx
     }
 
     private <T> T castOrNull(Class<T> key, Object o) {
-        if (key.isInstance(o))  return key.cast(o);
-        else                    return null;
+        if (key.isInstance(o)) {
+            return key.cast(o);
+        } else {
+            return null;
+        }
     }
 
     private @CheckForNull Launcher makeLauncher(@CheckForNull Launcher contextual) throws IOException, InterruptedException {
@@ -203,7 +206,7 @@ public PasswordParameterEnvironmentExpander(Run<?, ?> run) {
                         .filter(e -> e instanceof PasswordParameterValue
                                         && !((Secret) e.getValue()).getPlainText().isEmpty())
                         .map(ParameterValue::getName)
-                        .collect(Collectors.toCollection(() -> new HashSet<>())); // Make sure the set is serializable.
+                        .collect(Collectors.toCollection(HashSet::new)); // Make sure the set is serializable.
             } else {
                 passwordParameterVariables = Collections.emptySet();
             }

src/main/java/org/jenkinsci/plugins/workflow/support/actions/LogActionImpl.java

@@ -38,7 +38,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Level;
@@ -134,24 +133,21 @@ public AnnotatedLargeText<? extends FlowNode> getLogText() {
         } catch (IOException e) {
             ByteBuffer buf = new ByteBuffer();
             PrintStream ps;
-            try {
-                ps = new PrintStream(buf, false, "UTF-8");
-            } catch (UnsupportedEncodingException x) {
-                throw new AssertionError(x);
-            }
+            ps = new PrintStream(buf, false, StandardCharsets.UTF_8);
             ps.println("Failed to find log file for id="+parent.getId());
             e.printStackTrace(ps);
             ps.close();
-            return new AnnotatedLargeText<FlowNode>(buf, StandardCharsets.UTF_8, true, parent);
+            return new AnnotatedLargeText<>(buf, StandardCharsets.UTF_8, true, parent);
         }
     }
 
     /**
      * The actual log file.
      */
     private File getLogFile() throws IOException {
-        if (log==null)
+        if (log == null) {
             log = new File(parent.getExecution().getOwner().getRootDir(), parent.getId() + ".log");
+        }
         return log;
     }
 
@@ -162,8 +158,9 @@ private File getLogFile() throws IOException {
     @Restricted(DoNotUse.class) // Jelly
     public void writeLogTo(long offset, XMLOutput out) throws IOException {
         AnnotatedLargeText l = getLogText();
-        if (l!=null)
+        if (l != null) {
             l.writeHtmlTo(offset, out.asWriter());
+        }
     }
 
     @Override

src/main/java/org/jenkinsci/plugins/workflow/support/actions/PauseAction.java

@@ -139,7 +139,7 @@ public static boolean isPaused(@NonNull FlowNode node) {
      * @return The {@link PauseAction} instances for the supplied node. Returns an empty list if there are none.
      */
     public static @NonNull List<PauseAction> getPauseActions(@NonNull FlowNode node) {
-        List<PauseAction> pauseActions = new ArrayList<PauseAction>();
+        List<PauseAction> pauseActions = new ArrayList<>();
         List<Action> actions = node.getActions();
 
         for (Action action : actions) {

src/main/java/org/jenkinsci/plugins/workflow/support/actions/WorkspaceActionImpl.java

@@ -54,7 +54,7 @@ public WorkspaceActionImpl(FilePath workspace, FlowNode parent) {
         node = FilePathUtils.getNodeName(workspace);
         Jenkins j = Jenkins.getInstanceOrNull();
         Node n = j == null ? null : node.isEmpty() ? j : j.getNode(node);
-        labels = new TreeSet<LabelAtom>();
+        labels = new TreeSet<>();
         if (n != null) {
             labels.addAll(n.getAssignedLabels());
             labels.remove(n.getSelfLabel());

src/main/java/org/jenkinsci/plugins/workflow/support/actions/WorkspaceRunAction.java

@@ -86,9 +86,7 @@ public List<WorkspaceActionImpl> getActions() {
         }
         List<WorkspaceActionImpl> r = new ArrayList<>();
         for (FlowNode node : new DepthFirstScanner().allNodes(exec)) {
-            for (WorkspaceActionImpl action : node.getActions(WorkspaceActionImpl.class)) {
-                r.add(action);
-            }
+            r.addAll(node.getActions(WorkspaceActionImpl.class));
         }
         Collections.reverse(r);
         return r;

src/main/java/org/jenkinsci/plugins/workflow/support/concurrent/ChainingListenableFuture.java

@@ -37,7 +37,7 @@ class ChainingListenableFuture<I, O>
   private ListenableFuture<? extends I> inputFuture;
   private volatile ListenableFuture<? extends O> outputFuture;
   private final BlockingQueue<Boolean> mayInterruptIfRunningChannel =
-      new LinkedBlockingQueue<Boolean>(1);
+      new LinkedBlockingQueue<>(1);
   private final CountDownLatch outputCreated = new CountDownLatch(1);
 
   ChainingListenableFuture(

src/main/java/org/jenkinsci/plugins/workflow/support/concurrent/Futures.java

@@ -293,7 +293,7 @@ public static <I, O> ListenableFuture<O> transform(ListenableFuture<I> input,
             AsyncFunction<? super I, ? extends O> function,
             Executor executor) {
         ChainingListenableFuture<I, O> output =
-                new ChainingListenableFuture<I, O>(function, input);
+                new ChainingListenableFuture<>(function, input);
         input.addListener(output, executor);
         return output;
     }
@@ -399,7 +399,7 @@ public static <I, O> ListenableFuture<O> transform(ListenableFuture<I> input,
         final Function<? super I, ? extends O> function, Executor executor) {
       checkNotNull(function);
       AsyncFunction<I, O> wrapperFunction
-          = new AsyncFunction<I, O>() {
+          = new AsyncFunction<>() {
               @Override public ListenableFuture<O> apply(I input) {
                 O output = function.apply(input);
                 return immediateFuture(output);
@@ -427,7 +427,7 @@ public static <I, O> ListenableFuture<O> transform(ListenableFuture<I> input,
     @Beta
     public static <V> ListenableFuture<List<V>> allAsList(
         ListenableFuture<? extends V>... futures) {
-      return new ListFuture<V>(ImmutableList.copyOf(futures), true,
+      return new ListFuture<>(ImmutableList.copyOf(futures), true,
           MoreExecutors.directExecutor());
     }
 
@@ -450,7 +450,7 @@ public static <V> ListenableFuture<List<V>> allAsList(
     @Beta
     public static <V> ListenableFuture<List<V>> allAsList(
         Iterable<? extends ListenableFuture<? extends V>> futures) {
-      return new ListFuture<V>(ImmutableList.copyOf(futures), true,
+      return new ListFuture<>(ImmutableList.copyOf(futures), true,
           MoreExecutors.directExecutor());
     }
 }