Add workflow-multibranch-plugin (#280)

jenkinsci · Sep 30, 2020 · 2a4b8ef · 2a4b8ef
1 parent 7e2ba75
commit 2a4b8ef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/bom-latest/pom.xml b/bom-latest/pom.xml
@@ -16,6 +16,7 @@
         <workflow-api-plugin.version>2.40</workflow-api-plugin.version>
         <workflow-cps-plugin.version>2.83</workflow-cps-plugin.version>
         <workflow-job-plugin.version>2.39</workflow-job-plugin.version>
+        <workflow-multibranch-plugin.version>2.22</workflow-multibranch-plugin.version>
         <workflow-step-api-plugin.version>2.22</workflow-step-api-plugin.version>
         <workflow-support-plugin.version>3.5</workflow-support-plugin.version>
     </properties>
@@ -85,6 +86,17 @@
                 <classifier>tests</classifier>
                 <version>${workflow-job-plugin.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins.workflow</groupId>
+                <artifactId>workflow-multibranch</artifactId>
+                <version>${workflow-multibranch-plugin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins.workflow</groupId>
+                <artifactId>workflow-multibranch</artifactId>
+                <classifier>tests</classifier>
+                <version>${workflow-multibranch-plugin.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins.workflow</groupId>
                 <artifactId>workflow-scm-step</artifactId>

diff --git a/sample-plugin/check.groovy b/sample-plugin/check.groovy
@@ -7,7 +7,7 @@ assert artifactMap['junit:junit'] == project.artifactMap['junit:junit']
 def managedPluginDeps = managedDeps.collect {stripAllButGA(it)}.grep { ga ->
     def art = artifactMap[ga]
     if (art == null) {
-        if (ga.contains('.plugins:')) { // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin
+        if (ga.contains('.plugins')) { // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin
             throw new org.apache.maven.plugin.MojoFailureException("Managed plugin dependency $ga not listed in test classpath of sample plugin")
         } else {
             println "Do not see managed dependency $ga"

diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
@@ -72,11 +72,6 @@
             <artifactId>workflow-basic-steps</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-cps</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-cps</artifactId>
@@ -96,11 +91,17 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-job</artifactId>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-job</artifactId>
+            <artifactId>workflow-multibranch</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
+            <artifactId>workflow-multibranch</artifactId>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>