Skip to content

Commit c1fbd97

Browse files
authored
Merge pull request #298 from bitwiseman/patch-3
Add Java 11 build
2 parents 1ad7abb + 83c80e9 commit c1fbd97

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
buildPlugin()
1+
buildPlugin(configurations: buildPlugin.recommendedConfigurations())

src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
* </dd>
180180
* <dt>PERSISTED</dt>
181181
* <dd>
182-
* {@link CpsFlowExecution} is on disk with its owner, for example in <tt>build.xml</tt> of the workflow run.
182+
* {@link CpsFlowExecution} is on disk with its owner, for example in {@code build.xml} of the workflow run.
183183
* Nothing exists in memory. For example, Jenkins is not running.
184184
*
185185
* Transition from this into PREPARING is triggered outside our control by XStream using

src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
package org.jenkinsci.plugins.workflow.cps;
2626

27+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2728
import hudson.AbortException;
2829
import hudson.Extension;
2930
import hudson.FilePath;
@@ -35,7 +36,6 @@
3536
import hudson.model.Node;
3637
import hudson.model.Queue;
3738
import hudson.model.Run;
38-
import hudson.model.Run.RunnerAbortedException;
3939
import hudson.model.TaskListener;
4040
import hudson.model.TopLevelItem;
4141
import hudson.scm.SCM;
@@ -92,6 +92,11 @@ public boolean isLightweight() {
9292
this.lightweight = lightweight;
9393
}
9494

95+
@SuppressFBWarnings(
96+
value = {"NP_LOAD_OF_KNOWN_NULL_VALUE", "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE",
97+
"RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE", "RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"},
98+
justification = "false positives for try-resource in java 11"
99+
)
95100
@Override public CpsFlowExecution create(FlowExecutionOwner owner, TaskListener listener, List<? extends Action> actions) throws Exception {
96101
for (Action a : actions) {
97102
if (a instanceof CpsFlowFactoryAction2) {

0 commit comments

Comments
 (0)