[JENKINS-48035] Revert branch-api back to test scope and use SCMSourc…

…eOwner
jenkinsci · Dec 12, 2017 · 93cc3f4 · 93cc3f4
1 parent 9213e3b
commit 93cc3f4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,11 +68,6 @@
             <artifactId>display-url-api</artifactId>
             <version>0.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>branch-api</artifactId>
-            <version>2.0.16</version>
-        </dependency>
         <!-- Currently just here for interactive testing via hpi:run: -->
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -93,6 +88,12 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>branch-api</artifactId>
+            <version>2.0.11</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-aggregator</artifactId>

diff --git a/.../org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceRepositoryNameContributor.java b/.../org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceRepositoryNameContributor.java
@@ -4,7 +4,7 @@
 import com.cloudbees.jenkins.GitHubRepositoryNameContributor;
 import hudson.Extension;
 import hudson.model.Item;
-import jenkins.branch.MultiBranchProject;
+import jenkins.scm.api.SCMSourceOwner;
 
 import java.util.Collection;
 
@@ -13,8 +13,8 @@ public class GitHubSCMSourceRepositoryNameContributor extends GitHubRepositoryNa
 
     @Override
     public void parseAssociatedNames(Item item, Collection<GitHubRepositoryName> result) {
-        if (item instanceof MultiBranchProject) {
-            MultiBranchProject mp = (MultiBranchProject) item;
+        if (item instanceof SCMSourceOwner) {
+            SCMSourceOwner mp = (SCMSourceOwner) item;
             for (Object o : mp.getSCMSources()) {
                 if (o instanceof GitHubSCMSource) {
                     GitHubSCMSource gitHubSCMSource = (GitHubSCMSource) o;