Merge pull request #8 from jglick/slashy-branches-JENKINS-30744

[JENKINS-30744] Updated to use Branch.encodedName
jenkinsci · Nov 6, 2015 · d72b8c9 · d72b8c9
2 parents 677e289 + a9499bc
commit d72b8c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.580.3</version> <!-- to match branch-api -->
+    <version>1.609.1</version> <!-- to match branch-api -->
   </parent>
 
   <artifactId>literate</artifactId>
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>branch-api</artifactId>
-      <version>0.2-beta-4</version>
+      <version>0.2-beta-7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/org/cloudbees/literate/jenkins/LiterateBranchProject.java b/src/main/java/org/cloudbees/literate/jenkins/LiterateBranchProject.java
@@ -129,7 +129,7 @@ public class LiterateBranchProject extends Project<LiterateBranchProject, Litera
      * @param branch the branch.
      */
     public LiterateBranchProject(@NonNull LiterateMultibranchProject parent, @NonNull Branch branch) {
-        super(parent, branch.getName());
+        super(parent, branch.getEncodedName());
         this.branch = branch;
     }
 
@@ -203,15 +203,6 @@ private <T extends Describable<T>> void setDescribableListItems(DescribableList<
     }
 
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    @NonNull
-    public synchronized String getName() {
-        return branch.getName();
-    }
-
     /**
      * {@inheritDoc}
      */