[FIXED JENKINS-37644] - Update Folders Plugin dependency to fix the c…

…ompatibility issue (#33) [FIXED JENKINS-37644] - Update Folders Plugin dependency to fix the compatibility issue
jenkinsci · Sep 28, 2016 · 6ec664b · 6ec664b
1 parent fbba7ab
commit 6ec664b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>org.jenkins-ci.plugins</groupId>
 			<artifactId>cloudbees-folder</artifactId>
-			<version>4.2</version>
+			<version>5.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

diff --git a/src/main/java/jenkins/advancedqueue/jobinclusion/strategy/FolderPropertyLoader.java b/src/main/java/jenkins/advancedqueue/jobinclusion/strategy/FolderPropertyLoader.java
@@ -23,14 +23,15 @@
  */
 package jenkins.advancedqueue.jobinclusion.strategy;
 
+import com.cloudbees.hudson.plugins.folder.AbstractFolder;
+import com.cloudbees.hudson.plugins.folder.AbstractFolderProperty;
+import com.cloudbees.hudson.plugins.folder.AbstractFolderPropertyDescriptor;
 import hudson.model.ItemGroup;
 import hudson.model.Job;
 import hudson.model.TopLevelItem;
 import hudson.util.DescribableList;
 import jenkins.advancedqueue.DecisionLogger;
 
-import com.cloudbees.hudson.plugins.folder.FolderProperty;
-import com.cloudbees.hudson.plugins.folder.FolderPropertyDescriptor;
 import com.cloudbees.hudson.plugins.folder.Folder;
 
 /**
@@ -43,11 +44,11 @@ static public String getJobGroupName(DecisionLogger decisionLogger, Job<?, ?> jo
 		ItemGroup<?> parent = job.getParent();
 		decisionLogger.addDecisionLog(2, "Checking for Cloudbees Folder inclusion ...");
 		while(parent != null) {
-			if(parent instanceof Folder) {
-				Folder folder = (Folder) parent;
+			if(parent instanceof AbstractFolder) {
+				AbstractFolder folder = (AbstractFolder) parent;
 				decisionLogger.addDecisionLog(3, "Evaluating Folder [" + folder.getFullName() + "] ...");
-				DescribableList<FolderProperty<?>,FolderPropertyDescriptor> properties = folder.getProperties();
-				for(FolderProperty<?> property : properties) {
+				DescribableList<AbstractFolderProperty<?>,AbstractFolderPropertyDescriptor> properties = folder.getProperties();
+				for(AbstractFolderProperty<?> property : properties) {
 					if(property instanceof JobInclusionFolderProperty) {
 						JobInclusionFolderProperty incProperty = (JobInclusionFolderProperty) property;
 						if(incProperty.isUseJobGroup()) {