Branch: refs/heads/stable-2.89
Home: https://github.com/jenkinsci/jenkins
Commit: 7b6c86dc581e573a91802639647630ae40d8e208
https://github.com/jenkinsci/jenkins/commit/7b6c86dc581e573a91802639647630ae40d8e208
Author: Devin Nusbaum <dwnusb...@users.noreply.github.com>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M core/src/main/java/hudson/PluginManager.java
M test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java
A
test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin.zip
Log Message:
-----------
[JENKINS-48899] Do not downgrade detached plugins when upgrading Jenkins
(#3229)
* Reproduce JENKINS-48899
* Do not downgrade installed detached plugins
(cherry picked from commit d6298979581da67336f077cda9fd218eb790bdb3)
Commit: c359b86053dfe48c797f3b2135f72fb32cf8b609
https://github.com/jenkinsci/jenkins/commit/c359b86053dfe48c797f3b2135f72fb32cf8b609
Author: Vincent Latombe <vinc...@latombe.net>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M core/src/main/java/hudson/util/PluginServletFilter.java
M core/src/main/java/jenkins/install/InstallState.java
M core/src/main/java/jenkins/install/InstallUtil.java
M core/src/main/java/jenkins/install/SetupWizard.java
M core/src/main/java/jenkins/model/Jenkins.java
A test/src/test/java/jenkins/install/SetupWizardRestartTest.java
Log Message:
-----------
[FIXES JENKINS-47439] Setup wizard does not resume after restart (#3166)
* [JENKINS-47439] Add a failing test
On first startup, the setup wizard goes into state NEW and the filter to
force display the setup wizard is installed.
On second startup, the setup wizard goes into state RESTART (which
assumes the setup wizard is done), and the setup wizard is skipped
completely.
This test expects that state NEW is retained upon restart when nothing
is done.
* [JENKINS-47439] Persist InstallState
In some cases, the heuristics to determine the current setup wizard state are
fragile. It is safer to persist the install state so that upon restart,
the setup wizard can resume where it was left off.
* Missing javadoc and since for new public methods
* s/XXX/FIXME/
* Missed that one
* Setup wizard filter should be removed when entering a state where setup is
complete
* Use parameterized logging
* Improvements over previous impl
* Removed static isUsingSecurityToken. Now only determined from install
state.
* Call onInstallStateUpdate before InstallState#initializeState as the
latter can update state.
* Triggering a new build
(cherry picked from commit 30ab4481f286a5c33499489dfcb9b3df6587ff38)
Compare:
https://github.com/jenkinsci/jenkins/compare/bed6ccd71921...c359b86053df
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
