Merge pull request #3193 from dwnusbaum/JENKINS-48365

[JENKINS-48365] Install detached plugins when upgrading Jenkins past the version the plugins were detached
This commit is contained in:
Oleg Nenashev authored and GitHub committed 2017-12-17 14:26:51 +01:00
commit 968b6adf00
6 files changed
+171 -4

No files matched your search

+2 -3
View File
@@ -679,9 +679,8 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
* </ul>
*/
protected void loadDetachedPlugins() {
InstallState installState = Jenkins.getActiveInstance().getInstallState();
if (InstallState.UPGRADE.equals(installState)) {
VersionNumber lastExecVersion = new VersionNumber(InstallUtil.getLastExecVersion());
VersionNumber lastExecVersion = new VersionNumber(InstallUtil.getLastExecVersion());
if (lastExecVersion.isNewerThan(InstallUtil.NEW_INSTALL_VERSION) && lastExecVersion.isOlderThan(Jenkins.getVersion())) {
LOGGER.log(INFO, "Upgrading Jenkins. The last running version was {0}. This Jenkins is version {1}.",
new Object[] {lastExecVersion, Jenkins.VERSION});