Merge pull request #340 from dwnusbaum/strict-bundled-artifacts

Enable strict bundled artifact checks

Author: jglick

pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>5.18</version>
+        <version>5.24</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -69,6 +69,8 @@
         <no-test-jar>false</no-test-jar>
         <useBeta>true</useBeta>
         <hpi.compatibleSinceVersion>3.0</hpi.compatibleSinceVersion>
+        <hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
+        <hpi.bundledArtifacts>jboss-marshalling,jboss-marshalling-river</hpi.bundledArtifacts>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
     <dependencyManagement>

src/test/java/org/jenkinsci/plugins/workflow/test/steps/SemaphoreStepTest.java

@@ -1,27 +1,26 @@
 package org.jenkinsci.plugins.workflow.test.steps;
 
 import hudson.model.Result;
-import hudson.model.queue.QueueTaskFuture;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.JenkinsRule;
 
-import static org.junit.Assert.assertNotNull;
-
 public class SemaphoreStepTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
+    @Rule
+    public BuildWatcher watcher = new BuildWatcher();
+
     @Test
     public void hardKill() throws Exception {
         WorkflowJob p1 = j.jenkins.createProject(WorkflowJob.class, "p");
         p1.setDefinition(new CpsFlowDefinition("echo 'locked!'; semaphore 'wait'"));
-        QueueTaskFuture<WorkflowRun> future = p1.scheduleBuild2(0);
-        assertNotNull(future);
-        WorkflowRun b = future.waitForStart();
+        WorkflowRun b = p1.scheduleBuild2(0).waitForStart();
         SemaphoreStep.waitForStart("wait/1", b);
 
         b.doKill();