[JENKINS-21486] Cycle monitor should display plugin long name and

version
jenkinsci · Jul 29, 2016 · d8f3bfc · d8f3bfc
1 parent 6bf02d5
commit d8f3bfc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
@@ -1868,22 +1868,22 @@ public static final class PluginCycleDependenciesMonitor extends AdministrativeM
 
         private transient volatile boolean isActive = false;
 
-        private transient volatile List<String> pluginsWithCycle;
+        private transient volatile List<PluginWrapper> pluginsWithCycle;
 
         public boolean isActivated() {
             if(pluginsWithCycle == null){
-                pluginsWithCycle = new ArrayList<String>();
+                pluginsWithCycle = new ArrayList<>();
                 for (PluginWrapper p : Jenkins.getInstance().getPluginManager().getPlugins()) {
                     if(p.hasCycleDependency()){
-                        pluginsWithCycle.add(p.getShortName());
+                        pluginsWithCycle.add(p);
                         isActive = true;
                     }
                 }
             }
             return isActive;
         }
 
-        public List<String> getPluginsWithCycle() {
+        public List<PluginWrapper> getPluginsWithCycle() {
             return pluginsWithCycle;
         }
     }

diff --git a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
     ${%PluginCycles}
     <ul>
 	    <j:forEach var="p" items="${it.pluginsWithCycle}">
-	        <li><j:out value="${p}"/></li>
+	        <li><j:out value="${p.longName} v${p.version}"/></li>
 	    </j:forEach>
     </ul>
   </div>