Bump plugin dependencies

jenkinsci · May 4, 2020 · f39b010 · f39b010
1 parent 798c759
commit f39b010
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -75,32 +75,20 @@
       </plugins>
     </build>
     <properties>
-        <workflow-support-plugin.version>3.0</workflow-support-plugin.version>
+        <workflow-support-plugin.version>3.3</workflow-support-plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.jenkins-ci</groupId>
                 <artifactId>symbol-annotation</artifactId>
-                <version>1.14</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>scm-api</artifactId>
-                <version>2.2.6</version>
+                <version>1.18</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>structs</artifactId>
-                <version>1.14</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>script-security</artifactId>
-                <version>1.39</version>
+                <version>1.18</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -115,37 +103,37 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-api</artifactId>
-            <version>2.30</version>
+            <version>2.35</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-basic-steps</artifactId>
-            <version>2.3</version>
+            <version>2.18</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-cps</artifactId>
-            <version>2.28</version>
+            <version>2.70</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-durable-task-step</artifactId>
-            <version>2.4</version>
+            <version>2.31</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-job</artifactId>
-            <version>2.9</version>
+            <version>2.33</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-step-api</artifactId>
-            <version>2.13</version>
+            <version>2.20</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/plugin/src/test/java/hudson/plugins/swarm/PipelineJobTest.java b/plugin/src/test/java/hudson/plugins/swarm/PipelineJobTest.java
@@ -196,9 +196,6 @@ private static String getFlow(Node node, int numSemaphores) {
         for (int i = 0; i < numSemaphores; i++) {
             sb.append("  semaphore 'wait-" + i + "'\n");
         }
-        // TODO: Once JENKINS-41854 is fixed, remove the next two lines.
-        sb.append("}\n");
-        sb.append("node('" + node.getNodeName() + "') {\n");
         sb.append(
                 "  isUnix() ? sh('echo ON_SWARM_CLIENT=$ON_SWARM_CLIENT') : bat('echo ON_SWARM_CLIENT=%ON_SWARM_CLIENT%')");
         sb.append("}\n");