Add Java version check to setup wizard and installNecessaryPlugins

I'm not sure what the log message is supposed to be for, but other
checks also log, so apply the same behavior for Java dependency.
This commit is contained in:
Daniel Beck committed 2018-09-20 11:38:40 -07:00
1 parent 725fb3026b
commit f55864fe49
2 files changed
+7 -3

No files matched your search

+6 -2
View File
@@ -1719,7 +1719,9 @@ 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.isForNewerJava()) {
LOGGER.log(WARNING, "{0}@{1} was built for a newer Java", new Object[] {toInstall.name, toInstall.version});
}
jobs.add(toInstall.deploy(true));
} else if (pw.isOlderThan(requestedPlugin.getValue())) { // upgrade
UpdateSite.Plugin toInstall = uc.getPlugin(requestedPlugin.getKey());
@@ -1737,7 +1739,9 @@ 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.isForNewerJava()) {
LOGGER.log(WARNING, "{0}@{1} was built for a newer Java", new Object[] {toInstall.name, toInstall.version});
}
if (!toInstall.isCompatibleWithInstalledVersion()) {
LOGGER.log(WARNING, "{0}@{1} is incompatible with the installed @{2}", new Object[] {toInstall.name, toInstall.version, pw.getVersion()});
}