Merge remote-tracking branch 'upstream/master' [JENKINS-29545]

jenkinsci · Jul 21, 2015 · a69e3fc · a69e3fc
2 parents 99a4b1c + 89ea91d
commit a69e3fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -93,7 +93,7 @@
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>ws-cleanup</artifactId>
       <version>0.26</version>
-      <optional>true</optional>
+      <scope>test</scope>
     </dependency>
 
     <dependency>

diff --git a/src/main/java/org/jenkins/ci/plugins/jenkinslint/check/CleanupWorkspaceChecker.java b/src/main/java/org/jenkins/ci/plugins/jenkinslint/check/CleanupWorkspaceChecker.java
@@ -21,9 +21,8 @@ public CleanupWorkspaceChecker() {
 
     public boolean executeCheck(Item item) {
         if (Jenkins.getInstance().pluginManager.getPlugin("ws-cleanup")!=null) {
-            return item instanceof Project && ((Project) item).getPublisher(Descriptor.find(hudson.plugins.ws_cleanup.WsCleanup.DescriptorImpl.class.getName())) == null;
+            return item instanceof Project && ((Project) item).getPublisher(Descriptor.find("hudson.plugins.ws_cleanup.WsCleanup")) == null;
         } else {
-            // If ws-cleanup hasn't been installed yet
             return true;
         }
     }