Make workflow-api compatible with Guava 21.0 and newer

.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.2</version>
   </extension>
 </extensions>

pom.xml

@@ -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:git://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
+        <url>https://github.com/${gitHubRepo}</url>
         <tag>${scmTag}</tag>
     </scm>
     <repositories>
@@ -64,10 +64,11 @@
     <properties>
         <revision>2.42</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.176.4</jenkins.version>
+        <jenkins.version>2.273-rc30689.09147672b85b</jenkins.version>
         <java.level>8</java.level>
         <no-test-jar>false</no-test-jar>
         <useBeta>true</useBeta>
+        <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -104,6 +105,11 @@
             <artifactId>workflow-basic-steps</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>trilead-api</artifactId>
+            <scope>test</scope>
+        </dependency>
         <!-- For Semaphore step -->
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -133,4 +139,18 @@
           <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- TODO the tests depend on workflow-support and cps which both need api published first... -->
+                    <!-- need to run at least one flag or the pipeline fails -->
+                    <test>InjectedTest</test>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

src/main/java/org/jenkinsci/plugins/workflow/flow/FlowExecutionList.java

@@ -5,6 +5,7 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.inject.Inject;
 import hudson.Extension;
 import hudson.ExtensionList;
@@ -180,9 +181,11 @@ public void onLoaded() {
                 Futures.addCallback(e.getCurrentExecutions(false), new FutureCallback<List<StepExecution>>() {
                     @Override
                     public void onSuccess(List<StepExecution> result) {
-                        LOGGER.log(FINE, "Will resume {0}", result);
-                        for (StepExecution se : result) {
-                            se.onResume();
+                        if (result != null) {
+                            LOGGER.log(FINE, "Will resume {0}", result);
+                            for (StepExecution se : result) {
+                                se.onResume();
+                            }
                         }
                     }
 
@@ -194,7 +197,7 @@ public void onFailure(Throwable t) {
                             LOGGER.log(WARNING, "Failed to load " + e, t);
                         }
                     }
-                });
+                }, MoreExecutors.newDirectExecutorService());
             }
         }
     }
@@ -217,11 +220,13 @@ public ListenableFuture<?> apply(final Function<StepExecution, Void> f) {
                 Futures.addCallback(execs,new FutureCallback<List<StepExecution>>() {
                     @Override
                     public void onSuccess(List<StepExecution> result) {
-                        for (StepExecution e : result) {
-                            try {
-                                f.apply(e);
-                            } catch (RuntimeException x) {
-                                LOGGER.log(Level.WARNING, null, x);
+                        if (result != null) {
+                            for (StepExecution e : result) {
+                                try {
+                                    f.apply(e);
+                                } catch (RuntimeException x) {
+                                    LOGGER.log(Level.WARNING, null, x);
+                                }
                             }
                         }
                     }
@@ -230,7 +235,7 @@ public void onSuccess(List<StepExecution> result) {
                     public void onFailure(Throwable t) {
                         LOGGER.log(Level.WARNING, null, t);
                     }
-                });
+                }, MoreExecutors.newDirectExecutorService());
             }
 
             return Futures.allAsList(all);

src/main/java/org/jenkinsci/plugins/workflow/graphanalysis/ForkScanner.java

@@ -26,6 +26,7 @@
 
 import com.google.common.base.Predicate;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jenkinsci.plugins.workflow.actions.ThreadNameAction;
 import org.jenkinsci.plugins.workflow.actions.TimingAction;
 import org.jenkinsci.plugins.workflow.graph.BlockEndNode;
@@ -36,7 +37,6 @@
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 import java.util.ArrayDeque;
 import java.util.ArrayList;

src/main/java/org/jenkinsci/plugins/workflow/graphanalysis/NodeStepNamePredicate.java

@@ -24,14 +24,14 @@
 package org.jenkinsci.plugins.workflow.graphanalysis;
 
 import com.google.common.base.Predicate;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jenkinsci.plugins.workflow.graph.FlowEndNode;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.graph.FlowStartNode;
 import org.jenkinsci.plugins.workflow.graph.StepNode;
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 

src/main/java/org/jenkinsci/plugins/workflow/graphanalysis/NodeStepTypePredicate.java

@@ -24,14 +24,14 @@
 package org.jenkinsci.plugins.workflow.graphanalysis;
 
 import com.google.common.base.Predicate;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jenkinsci.plugins.workflow.graph.FlowEndNode;
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.jenkinsci.plugins.workflow.graph.FlowStartNode;
 import org.jenkinsci.plugins.workflow.graph.StepNode;
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;