diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java index 68aa1d292f..56e31ded0c 100644 --- a/core/src/main/java/hudson/model/UpdateCenter.java +++ b/core/src/main/java/hudson/model/UpdateCenter.java @@ -618,11 +618,16 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas * Gets the plugin with the given name from the first {@link UpdateSite} to contain it. * @return Discovered {@link Plugin}. {@code null} if it cannot be found */ - public @CheckForNull Plugin getPlugin(String artifactId, VersionNumber minVersion) { + public @CheckForNull Plugin getPlugin(String artifactId, @CheckForNull VersionNumber minVersion) { + if (minVersion == null) { + return getPlugin(artifactId); + } for (UpdateSite s : sites) { Plugin p = s.getPlugin(artifactId); - if (minVersion.isNewerThan(new VersionNumber(p.version))) continue; - if (p!=null) return p; + if (p!=null) { + if (minVersion.isNewerThan(new VersionNumber(p.version))) continue; + return p; + } } return null; } diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index 86c2233f2a..02d8ab3a00 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -1066,7 +1066,7 @@ public class UpdateSite { List deps = new ArrayList(); for(Map.Entry e : dependencies.entrySet()) { - VersionNumber requiredVersion = new VersionNumber(e.getValue()); + VersionNumber requiredVersion = e.getValue() != null ? new VersionNumber(e.getValue()) : null; Plugin depPlugin = Jenkins.getInstance().getUpdateCenter().getPlugin(e.getKey(), requiredVersion); if (depPlugin == null) { LOGGER.log(Level.WARNING, "Could not find dependency {0} of {1}", new Object[] {e.getKey(), name});