[JENKINS-33819] OrphanedItemStrategy is propagated to the Multibranch…

… projects
jenkinsci · May 12, 2016 · 69c7132 · 69c7132
1 parent bb44e24
commit 69c7132
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>cloudbees-folder</artifactId>
-      <version>5.1</version>
+      <version>5.10-SNAPSHOT</version>
     </dependency>
     <!-- jenkins dependencies -->
     <!-- test dependencies -->

diff --git a/src/main/java/jenkins/branch/OrganizationFolder.java b/src/main/java/jenkins/branch/OrganizationFolder.java
@@ -163,6 +163,7 @@ public void complete() throws IllegalStateException, InterruptedException {
                                 PersistedList<BranchSource> sourcesList = existing.getSourcesList();
                                 sourcesList.clear();
                                 sourcesList.addAll(createBranchSources());
+                                existing.setOrphanedItemStrategy(getOrphanedItemStrategy());
                                 existing.scheduleBuild();
                                 return;
                             }
@@ -181,6 +182,7 @@ public void complete() throws IllegalStateException, InterruptedException {
                                     continue;
                                 }
                                 if (project != null) {
+                                    project.setOrphanedItemStrategy(getOrphanedItemStrategy());
                                     project.getSourcesList().addAll(createBranchSources());
                                     try {
                                         project.addTrigger(new PeriodicFolderTrigger("1d"));