diff --git a/pom.xml b/pom.xml index a13caf5f7..d2c7b4578 100644 --- a/pom.xml +++ b/pom.xml @@ -64,12 +64,12 @@ 2.58 -SNAPSHOT - 2.62 + 2.121.1 8 false 3.1.0 - 2.17 - 2.0.8 + 2.21-rc629.b249afdd9a58 + 2.2.6 1.24 1.15 @@ -82,7 +82,7 @@ org.jenkins-ci.plugins.workflow workflow-api - 2.27 + 2.30-rc820.ba604ce51277 org.jenkins-ci.plugins.workflow @@ -143,7 +143,7 @@ org.jenkins-ci.plugins.workflow workflow-job - 2.21 + 2.26-rc848.9e07b6336b19 test diff --git a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java b/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java index 290459f86..fa815fe87 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java @@ -35,7 +35,6 @@ import hudson.model.Slave; import hudson.model.TaskListener; import hudson.model.User; -import hudson.slaves.CommandLauncher; import hudson.slaves.ComputerLauncher; import hudson.slaves.NodeProperty; import hudson.slaves.RetentionStrategy; diff --git a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java index 854f71c7f..3e80d0efa 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/cps/FlowDurabilityTest.java @@ -847,7 +847,7 @@ private WorkflowRun runFuzzerJob(JenkinsRule jrule, String jobName, FlowDurabili * May fail rarely due to files being copied in a different order than they are modified as part of simulating a dirty restart. * See {@link RestartableJenkinsRule#simulateAbruptShutdown()} for why that copying happens. */ @Test - @Ignore //Too long to run as part of main suite + //Too long to run as part of main suite @TimedRepeatRule.RepeatForTime(repeatMillis = 150_000) public void fuzzTimingDurable() throws Exception { final String jobName = "NestedParallelDurableJob"; @@ -895,7 +895,7 @@ public void evaluate() throws Throwable { * May fail rarely due to files being copied in a different order than they are modified as part of simulating a dirty restart. * See {@link RestartableJenkinsRule#simulateAbruptShutdown()} for why that copying happens. */ @Test - @Ignore //Too long to run as part of main suite + //Too long to run as part of main suite @TimedRepeatRule.RepeatForTime(repeatMillis = 150_000) public void fuzzTimingNonDurableWithDirtyRestart() throws Exception { final String jobName = "NestedParallelDurableJob"; @@ -953,7 +953,7 @@ public void evaluate() throws Throwable { /** Test interrupting build by randomly restarting *cleanly* at unpredictable times and verify we stick pick up and resume. */ @Test - @Ignore //Too long to run as part of main suite + //Too long to run as part of main suite @TimedRepeatRule.RepeatForTime(repeatMillis = 150_000) public void fuzzTimingNonDurableWithCleanRestart() throws Exception {