diff --git a/Jenkinsfile b/Jenkinsfile
index a229fa51..39b42fc8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin()
+buildPlugin(useAci: true)
diff --git a/pom.xml b/pom.xml
index c74d8a28..6fd80937 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
plugin
- 3.54
+ 4.4
org.jenkins-ci.plugins.workflow
@@ -66,127 +66,111 @@ THE SOFTWARE.
2.22
-SNAPSHOT
8
- 2.138.4
- 2.6.3
+ 2.176.4
false
- 2.13
- 2.17
- 2.53
- 3.9.1
+ 2.39
2.13.0
+
+
+
+ io.jenkins.tools.bom
+ bom-2.176.x
+ 11
+ import
+ pom
+
+
+
org.jenkins-ci.plugins.workflow
workflow-step-api
- ${workflow-step-api.version}
org.jenkins-ci.plugins.workflow
workflow-job
- 2.21
+ ${workflow-job-plugin.version}
org.jenkins-ci.plugins.workflow
workflow-support
- ${workflow-support.version}
org.jenkins-ci.plugins
structs
- 1.17
org.jenkins-ci.plugins.workflow
workflow-cps
- ${workflow-cps.version}
org.jenkins-ci.plugins
scm-api
- ${scm-api.version}
org.jenkins-ci.plugins
branch-api
- 2.0.21
org.jenkins-ci.plugins
cloudbees-folder
- 6.1.2
org.jenkins-ci.plugins.workflow
workflow-api
- 2.27
org.jenkins-ci.plugins.workflow
workflow-scm-step
- 2.7
org.jenkins-ci.plugins
script-security
- 1.42
org.jenkins-ci.plugins
scm-api
- ${scm-api.version}
tests
test
org.jenkins-ci.plugins.workflow
workflow-basic-steps
- 2.3
test
org.jenkins-ci.plugins.workflow
workflow-durable-task-step
- 2.5
test
org.jenkins-ci.plugins.workflow
workflow-cps-global-lib
- 2.4
+ 2.17
test
-
-
- org.jenkins-ci.plugins
- git-client
-
-
org.jenkins-ci.plugins.workflow
workflow-step-api
- ${workflow-step-api.version}
tests
test
org.jenkins-ci.plugins.workflow
workflow-support
- ${workflow-support.version}
tests
test
org.jenkins-ci.plugins.workflow
workflow-cps
- ${workflow-cps.version}
tests
test
org.jenkins-ci.plugins
git
- ${git-plugin.version}
test
@@ -208,7 +192,6 @@ THE SOFTWARE.
org.jenkins-ci.plugins
git
- ${git-plugin.version}
tests
test
@@ -238,7 +221,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins.workflow
workflow-job
- 2.20
+ ${workflow-job-plugin.version}
tests
test
@@ -248,40 +231,19 @@ THE SOFTWARE.
2.2
test
-
- org.jenkins-ci.modules
- sshd
- 2.4
- test
-
-
- org.jenkins-ci.modules
- instance-identity
- 2.2
- test
-
-
- org.jenkins-ci.modules
- ssh-cli-auth
- 1.4
- test
-
org.jenkins-ci.plugins
credentials
- 2.1.16
test
org.jenkins-ci.plugins
mailer
- 1.18
test
org.jenkins-ci.plugins
junit
- 1.6
test
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMVar.java b/src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMVar.java
index e359f52e..7f365d82 100644
--- a/src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMVar.java
+++ b/src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMVar.java
@@ -97,7 +97,7 @@
} else {
SCMHead head = branch.getHead();
FlowExecutionOwner owner = ((WorkflowRun) build).asFlowExecutionOwner();
- TaskListener listener = owner != null ? owner.getListener() : TaskListener.NULL;
+ TaskListener listener = owner.getListener();
tip = scmSource.fetch(head, listener);
if (tip == null) {
throw new AbortException("Could not determine exact tip revision of " + branch.getName());
diff --git a/src/test/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStepTest.java
index eef3c0d3..cbbce7b6 100644
--- a/src/test/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStepTest.java
+++ b/src/test/java/org/jenkinsci/plugins/workflow/multibranch/JobPropertyStepTest.java
@@ -253,8 +253,10 @@ public void testChoiceParameterSnippetizer() throws Exception {
r.waitUntilNoActivity(); // #1 built automatically
assertEquals(1, p.getBuilds().size());
r.assertBuildStatusSuccess(p.scheduleBuild2(0)); // #2
+ Thread.sleep(500L); // WorkflowRun performs log rotation asynchronously.
assertEquals(1, p.getBuilds().size());
r.assertBuildStatusSuccess(p.scheduleBuild2(0)); // #3
+ Thread.sleep(500L); // WorkflowRun performs log rotation asynchronously.
assertEquals(1, p.getBuilds().size());
WorkflowRun b3 = p.getLastBuild();
assertEquals(3, b3.getNumber());