diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index be83e07456..fdee127447 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -1719,6 +1719,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas if (toInstall.isForNewerHudson()) { LOGGER.log(WARNING, "{0}@{1} was built for a newer Jenkins", new Object[] {toInstall.name, toInstall.version}); } + // TODO check Java dependency jobs.add(toInstall.deploy(true)); } else if (pw.isOlderThan(requestedPlugin.getValue())) { // upgrade UpdateSite.Plugin toInstall = uc.getPlugin(requestedPlugin.getKey()); @@ -1736,6 +1737,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas if (toInstall.isForNewerHudson()) { LOGGER.log(WARNING, "{0}@{1} was built for a newer Jenkins", new Object[] {toInstall.name, toInstall.version}); } + // TODO check Java dependency if (!toInstall.isCompatibleWithInstalledVersion()) { LOGGER.log(WARNING, "{0}@{1} is incompatible with the installed @{2}", new Object[] {toInstall.name, toInstall.version, pw.getVersion()}); } diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index 34a8c04b2d..0812aa7c44 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -1108,8 +1108,11 @@ public class UpdateSite { } /** + * Returns true iff the plugin declares a minimum Java version and it's newer than what the Jenkins master is running on. + * + * @return true iff the plugin declares a minimum Java version and it's newer than what the Jenkins master is running on. + * * @since TODO - * @return */ public boolean isForNewerJava() { try { @@ -1135,8 +1138,11 @@ public class UpdateSite { } /** + * Returns the minimum Java version needed to use the plugin and all its dependencies. + * + * @return the minimum Java version needed to use the plugin and all its dependencies. + * * @since TODO - * @return */ public VersionNumber getNeededDependenciesRequiredJava() { VersionNumber versionNumber = null; @@ -1173,6 +1179,13 @@ public class UpdateSite { }); } + /** + * Returns true iff this plugin or any of its dependencies require a newer Java than Jenkins is running on. + * + * @return true iff this plugin or any of its dependencies require a newer Java than Jenkins is running on. + * + * @since TODO + */ public boolean isNeededDependenciesForNewerJava() { for (Plugin p: getNeededDependencies()) { if (p.isForNewerJava() || p.isNeededDependenciesForNewerJava()) { diff --git a/core/src/main/resources/hudson/PluginManager/_table.css b/core/src/main/resources/hudson/PluginManager/_table.css index 90b80cfd19..9107c2be8b 100644 --- a/core/src/main/resources/hudson/PluginManager/_table.css +++ b/core/src/main/resources/hudson/PluginManager/_table.css @@ -10,4 +10,4 @@ } .compatWarning, .securityWarning { font-weight: bold; -} \ No newline at end of file +}