Branch: refs/heads/master Home: https://github.com/jenkinsci/jenkins Commit: 065b874a4784c5d0bcfd9731c0ad4139c5e61c78 https://github.com/jenkinsci/jenkins/commit/065b874a4784c5d0bcfd9731c0ad4139c5e61c78 Author: t-hall <ith...@comcast.net> Date: 2017-12-11 (Mon, 11 Dec 2017)
Changed paths: M core/src/main/java/hudson/tasks/Maven.java M test/src/test/java/hudson/tasks/MavenTest.java Log Message: ----------- [JENKINS-34138] Fix maven installs from stepping on each other (#3042) * [JENKINS-34138] Adding equals/hashCode methods so that installs don't step on each other * [JENKINS-34138] Added issue reference to unit tests * [JENKINS-34138] - changed the order of equals / hashcode (cherry picked from commit d688c154907d17e75ea31067c8fc2525aa679584) Commit: 6be05b801454820caf3c6159185669f4392f25de https://github.com/jenkinsci/jenkins/commit/6be05b801454820caf3c6159185669f4392f25de Author: Oleg Nenashev <o.v.nenas...@gmail.com> Date: 2017-12-11 (Mon, 11 Dec 2017) Changed paths: M core/src/main/java/hudson/model/MyViewsProperty.java M core/src/main/java/hudson/model/ViewGroupMixIn.java M test/src/test/java/hudson/model/MyViewsPropertyTest.java Log Message: ----------- [JENKINS-48157] - Risk of NPE when migrating MyViewProperty without PrimaryView (#3156) * [JENKINS-48157] - Reproduce the issue in test * [JENKINS-48157] - Annotate and document nullness conditions in MyViewsProperty and ViewGroupMixIn * [FIXED JENKINS-48157] - Prevent NPEs when using public API and when using null primaryViewName * [JENKINS-48157] - Fix typo in Javadoc (cherry picked from commit 211b57e8b002b4da92743dfac3a1b902835e7652) Commit: b450e9bdb60f6b3a0d492219a026438bf7b3b9d6 https://github.com/jenkinsci/jenkins/commit/b450e9bdb60f6b3a0d492219a026438bf7b3b9d6 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-12-11 (Mon, 11 Dec 2017) Changed paths: M core/src/main/java/hudson/model/User.java Log Message: ----------- [JENKINS-47429] User.getLegacyConfigFilesFor no longer seems to be necessary. (cherry picked from commit 3853b3813967bd3d46e4dde7741eb97fa628345c) Commit: b41473c3b0fdcae4fa98f1b8fa47679f35d4fa11 https://github.com/jenkinsci/jenkins/commit/b41473c3b0fdcae4fa98f1b8fa47679f35d4fa11 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-12-13 (Wed, 13 Dec 2017) Log Message: ----------- Merge branch 'stable-2.73' into stable-2.89 Commit: b225871afc4b8df8177bfd1f4c088a10c8a7644d https://github.com/jenkinsci/jenkins/commit/b225871afc4b8df8177bfd1f4c088a10c8a7644d Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-12-13 (Wed, 13 Dec 2017) Log Message: ----------- Merge branch 'stable-2.89' Commit: b6443aacbbc3fffec1f8f45ce1fb9fb322f5030f https://github.com/jenkinsci/jenkins/commit/b6443aacbbc3fffec1f8f45ce1fb9fb322f5030f Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2017-12-13 (Wed, 13 Dec 2017) Changed paths: M cli/pom.xml M core/pom.xml M pom.xml M test/pom.xml M war/pom.xml Log Message: ----------- [maven-release-plugin] prepare release jenkins-2.89.2 Commit: 8ae7df076e15cf6961902e2e632a9da9a8341ea8 https://github.com/jenkinsci/jenkins/commit/8ae7df076e15cf6961902e2e632a9da9a8341ea8 Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2017-12-13 (Wed, 13 Dec 2017) Changed paths: M cli/pom.xml M core/pom.xml M pom.xml M test/pom.xml M war/pom.xml Log Message: ----------- [maven-release-plugin] prepare for next development iteration Commit: 0e5db018ca2c120952273991f928bb273b83ed8b https://github.com/jenkinsci/jenkins/commit/0e5db018ca2c120952273991f928bb273b83ed8b Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2017-12-13 (Wed, 13 Dec 2017) Changed paths: M core/src/main/java/hudson/model/MyViewsProperty.java M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/model/ViewGroupMixIn.java M core/src/main/java/hudson/tasks/Maven.java M test/src/test/java/hudson/model/MyViewsPropertyTest.java M test/src/test/java/hudson/tasks/MavenTest.java Log Message: ----------- Merge remote-tracking branch 'origin/stable-2.89' into stable-2.89 Commit: 6466de8cf682b948095b7ebf72427b4dd8454fbb https://github.com/jenkinsci/jenkins/commit/6466de8cf682b948095b7ebf72427b4dd8454fbb Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-12-14 (Thu, 14 Dec 2017) Changed paths: M cli/pom.xml M core/pom.xml M core/src/main/java/hudson/model/MyViewsProperty.java M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/model/ViewGroupMixIn.java M core/src/main/java/hudson/tasks/Maven.java M core/src/main/java/jenkins/model/Jenkins.java M pom.xml M test/pom.xml M test/src/test/java/hudson/model/MyViewsPropertyTest.java M test/src/test/java/hudson/tasks/MavenTest.java M war/pom.xml Log Message: ----------- Merge branch 'stable-2.89' of git://github.com/jenkinsci/jenkins into stable-2.89 Commit: 8a889de6c8f6e546e44e469b3430ee31d63b69d4 https://github.com/jenkinsci/jenkins/commit/8a889de6c8f6e546e44e469b3430ee31d63b69d4 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-12-14 (Thu, 14 Dec 2017) Changed paths: M cli/pom.xml M core/pom.xml M core/src/main/java/jenkins/model/Jenkins.java M pom.xml M test/pom.xml M war/pom.xml Log Message: ----------- Merge commit '4c75250ad4b0d99496950ae83f4ba6aa2255c1c6' of git://github.com/jenkinsci/jenkins Commit: 69448007c814ccdb1e515227746bd4314dfb86ec https://github.com/jenkinsci/jenkins/commit/69448007c814ccdb1e515227746bd4314dfb86ec Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-12-14 (Thu, 14 Dec 2017) Log Message: ----------- Merge branch 'stable-2.89' Commit: 0aea8ab3afcf17667ae20d9b743b0eaf7e9fd370 https://github.com/jenkinsci/jenkins/commit/0aea8ab3afcf17667ae20d9b743b0eaf7e9fd370 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-12-14 (Thu, 14 Dec 2017) Log Message: ----------- Merge branch 'security-stable-2.89' into security-master Commit: 34191e78a6030d35899fd1f40e8e2e704e332c34 https://github.com/jenkinsci/jenkins/commit/34191e78a6030d35899fd1f40e8e2e704e332c34 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-02 (Tue, 02 Jan 2018) Changed paths: M cli/pom.xml M core/pom.xml M core/src/main/java/hudson/FilePath.java M core/src/main/java/hudson/Functions.java M core/src/main/java/hudson/Launcher.java M core/src/main/java/hudson/PluginManager.java M core/src/main/java/hudson/Util.java M core/src/main/java/hudson/XmlFile.java M core/src/main/java/hudson/cli/CLICommand.java M core/src/main/java/hudson/cli/ClientAuthenticationCache.java M core/src/main/java/hudson/cli/LoginCommand.java M core/src/main/java/hudson/cli/LogoutCommand.java M core/src/main/java/hudson/init/InitStrategy.java M core/src/main/java/hudson/model/AbstractItem.java M core/src/main/java/hudson/model/Cause.java M core/src/main/java/hudson/model/Computer.java M core/src/main/java/hudson/model/Hudson.java M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/model/View.java M core/src/main/java/hudson/security/ACL.java M core/src/main/java/hudson/security/BasicAuthenticationFilter.java M core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java M core/src/main/java/hudson/security/csrf/CrumbFilter.java M core/src/main/java/hudson/slaves/ChannelPinger.java M core/src/main/java/hudson/slaves/SlaveComputer.java M core/src/main/java/hudson/util/IOUtils.java M core/src/main/java/hudson/util/ReflectionUtils.java M core/src/main/java/hudson/util/Service.java M core/src/main/java/hudson/util/XStream2.java M core/src/main/java/jenkins/FilePathFilter.java M core/src/main/java/jenkins/InitReactorRunner.java M core/src/main/java/jenkins/install/InstallUtil.java M core/src/main/java/jenkins/model/Jenkins.java A core/src/main/java/jenkins/security/ApiCrumbExclusion.java M core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java M core/src/main/java/jenkins/security/ConfidentialStore.java M core/src/main/java/jenkins/security/SecurityListener.java M core/src/main/java/jenkins/slaves/DeprecatedAgentProtocolMonitor.java M core/src/main/java/jenkins/slaves/StandardOutputSwapper.java M core/src/main/resources/META-INF/upgrade/Hudson.hint A core/src/main/resources/META-INF/upgrade/Jenkins.hint A core/src/main/resources/hudson/markup/Messages_zh_CN.properties M core/src/main/resources/hudson/model/BooleanParameterDefinition/config_zh_CN.properties A core/src/main/resources/hudson/model/ChoiceParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/model/Computer/_scriptText.jelly A core/src/main/resources/hudson/model/Computer/configure_zh_CN.properties M core/src/main/resources/hudson/model/DownloadService/footer.jelly A core/src/main/resources/hudson/model/FileParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/model/Job/permalinks_zh_CN.properties M core/src/main/resources/hudson/model/Messages_zh_CN.properties A core/src/main/resources/hudson/model/PasswordParameterDefinition/config_zh_CN.properties A core/src/main/resources/hudson/model/RunParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/model/StringParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/model/TextParameterDefinition/config.jelly A core/src/main/resources/hudson/model/TextParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_CN.properties A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.jelly A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.properties M core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_zh_CN.properties A core/src/main/resources/jenkins/CLI/WarnWhenEnabled/message_zh_CN.properties M core/src/main/resources/jenkins/model/Jenkins/_scriptText.jelly M core/src/main/resources/lib/form/advanced_fr.properties M core/src/main/resources/lib/hudson/artifactList.jelly A core/src/main/resources/lib/hudson/project/config-assignedLabel_zh_CN.properties M core/src/main/resources/lib/hudson/scriptConsole_de.properties M core/src/main/resources/lib/layout/breakable.jelly M core/src/main/resources/lib/layout/progressiveRendering.jelly M core/src/test/java/hudson/FilePathTest.java M core/src/test/java/hudson/UtilTest.java M core/src/test/java/hudson/util/XStream2Test.java M pom.xml M test/pom.xml M test/src/test/java/hudson/PluginManagerUtil.java M test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java M test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java M test/src/test/java/hudson/model/AbstractProjectTest.java M test/src/test/java/hudson/model/ExecutorTest.java M test/src/test/java/hudson/model/ItemsTest.java M test/src/test/java/hudson/model/JobTest.java M test/src/test/java/hudson/model/PasswordParameterDefinitionTest.java M test/src/test/java/hudson/model/ProjectTest.java M test/src/test/java/hudson/model/QueueTest.java M test/src/test/java/hudson/model/UserTest.java M test/src/test/java/hudson/model/ViewTest.java M test/src/test/java/hudson/security/CliAuthenticationTest.java M test/src/test/java/hudson/security/ExtendedReadPermissionTest.java M test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java M test/src/test/java/hudson/security/LoginTest.java M test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java M test/src/test/java/hudson/util/RobustReflectionConverterTest.java A test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java M test/src/test/java/jenkins/model/JenkinsTest.java A test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java M test/src/test/java/jenkins/security/ApiTokenPropertyTest.java M test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java M test/src/test/java/jenkins/security/Security218CliTest.java M test/src/test/java/jenkins/security/Security380Test.java A test/src/test/java/jenkins/security/SpySecurityListener.java M test/src/test/java/lib/form/PasswordTest.java A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins1/config.xml A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2/jenkins.install.InstallUtil.lastExecVersion A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerDependency.zip A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency.zip A test/src/test/resources/lib/form/PasswordTest/SecretNotPlainText/index.jelly R test/src/test/resources/lib/form/PasswordTest/test1.jelly M test/src/test/resources/lib/layout/RenderOnDemandTest/externalScript.jelly M war/pom.xml M war/src/main/webapp/favicon.ico A war/src/main/webapp/help/parameter/boolean-default_zh_CN.html A war/src/main/webapp/help/parameter/boolean_zh_CN.html A war/src/main/webapp/help/parameter/choice-choices_zh_CN.html A war/src/main/webapp/help/parameter/choice_zh_CN.html A war/src/main/webapp/help/parameter/description_zh_CN.html A war/src/main/webapp/help/parameter/file-name_zh_CN.html A war/src/main/webapp/help/parameter/file_zh_CN.html A war/src/main/webapp/help/parameter/name_zh_CN.html A war/src/main/webapp/help/parameter/run_zh_CN.html A war/src/main/webapp/help/parameter/string-default_zh_CN.html A war/src/main/webapp/help/parameter/string_zh_CN.html A war/src/main/webapp/help/parameter/trim_zh_CN.html A war/src/main/webapp/help/system-config/master-slave/availability_zh_CN.html A war/src/main/webapp/help/system-config/master-slave/demand/idleDelay_zh_CN.html A war/src/main/webapp/help/system-config/master-slave/demand/inDemandDelay_zh_CN.html A war/src/main/webapp/help/system-config/master-slave/description_zh_CN.html Log Message: ----------- Merge commit '99ca10114332e7c6fe12b676ea1919617070a488' of git://github.com/jenkinsci/jenkins Commit: 791646f98f53d301660657f2221c6db3a1705fab https://github.com/jenkinsci/jenkins/commit/791646f98f53d301660657f2221c6db3a1705fab Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-02 (Tue, 02 Jan 2018) Changed paths: M cli/pom.xml M core/pom.xml M core/src/main/java/hudson/FilePath.java M core/src/main/java/hudson/Functions.java M core/src/main/java/hudson/Launcher.java M core/src/main/java/hudson/PluginManager.java M core/src/main/java/hudson/Util.java M core/src/main/java/hudson/XmlFile.java M core/src/main/java/hudson/cli/CLICommand.java M core/src/main/java/hudson/cli/ClientAuthenticationCache.java M core/src/main/java/hudson/cli/LoginCommand.java M core/src/main/java/hudson/cli/LogoutCommand.java M core/src/main/java/hudson/init/InitStrategy.java M core/src/main/java/hudson/model/AbstractItem.java M core/src/main/java/hudson/model/Cause.java M core/src/main/java/hudson/model/Computer.java M core/src/main/java/hudson/model/Hudson.java M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/model/View.java M core/src/main/java/hudson/security/ACL.java M core/src/main/java/hudson/security/BasicAuthenticationFilter.java M core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java M core/src/main/java/hudson/security/csrf/CrumbFilter.java M core/src/main/java/hudson/slaves/ChannelPinger.java M core/src/main/java/hudson/slaves/SlaveComputer.java M core/src/main/java/hudson/util/IOUtils.java M core/src/main/java/hudson/util/ReflectionUtils.java M core/src/main/java/hudson/util/Service.java M core/src/main/java/hudson/util/XStream2.java M core/src/main/java/jenkins/FilePathFilter.java M core/src/main/java/jenkins/InitReactorRunner.java M core/src/main/java/jenkins/install/InstallUtil.java M core/src/main/java/jenkins/model/Jenkins.java A core/src/main/java/jenkins/security/ApiCrumbExclusion.java M core/src/main/java/jenkins/security/BasicHeaderApiTokenAuthenticator.java M core/src/main/java/jenkins/security/ConfidentialStore.java M core/src/main/java/jenkins/security/SecurityListener.java M core/src/main/java/jenkins/slaves/DeprecatedAgentProtocolMonitor.java M core/src/main/java/jenkins/slaves/StandardOutputSwapper.java M core/src/main/resources/META-INF/upgrade/Hudson.hint A core/src/main/resources/META-INF/upgrade/Jenkins.hint A core/src/main/resources/hudson/markup/Messages_zh_CN.properties M core/src/main/resources/hudson/model/BooleanParameterDefinition/config_zh_CN.properties A core/src/main/resources/hudson/model/ChoiceParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/model/Computer/_scriptText.jelly A core/src/main/resources/hudson/model/Computer/configure_zh_CN.properties M core/src/main/resources/hudson/model/DownloadService/footer.jelly A core/src/main/resources/hudson/model/FileParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/model/Job/permalinks_zh_CN.properties M core/src/main/resources/hudson/model/Messages_zh_CN.properties A core/src/main/resources/hudson/model/PasswordParameterDefinition/config_zh_CN.properties A core/src/main/resources/hudson/model/RunParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/model/StringParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/model/TextParameterDefinition/config.jelly A core/src/main/resources/hudson/model/TextParameterDefinition/config_zh_CN.properties M core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index_zh_CN.properties A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.jelly A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.properties M core/src/main/resources/hudson/slaves/DumbSlave/configure-entries_zh_CN.properties A core/src/main/resources/jenkins/CLI/WarnWhenEnabled/message_zh_CN.properties M core/src/main/resources/jenkins/model/Jenkins/_scriptText.jelly M core/src/main/resources/lib/form/advanced_fr.properties M core/src/main/resources/lib/hudson/artifactList.jelly A core/src/main/resources/lib/hudson/project/config-assignedLabel_zh_CN.properties M core/src/main/resources/lib/hudson/scriptConsole_de.properties M core/src/main/resources/lib/layout/breakable.jelly M core/src/main/resources/lib/layout/progressiveRendering.jelly M core/src/test/java/hudson/FilePathTest.java M core/src/test/java/hudson/UtilTest.java M core/src/test/java/hudson/util/XStream2Test.java M pom.xml M test/pom.xml M test/src/test/java/hudson/PluginManagerUtil.java M test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java M test/src/test/java/hudson/diagnosis/HudsonHomeDiskUsageMonitorTest.java M test/src/test/java/hudson/model/AbstractProjectTest.java M test/src/test/java/hudson/model/ExecutorTest.java M test/src/test/java/hudson/model/ItemsTest.java M test/src/test/java/hudson/model/JobTest.java M test/src/test/java/hudson/model/PasswordParameterDefinitionTest.java M test/src/test/java/hudson/model/ProjectTest.java M test/src/test/java/hudson/model/QueueTest.java M test/src/test/java/hudson/model/UserTest.java M test/src/test/java/hudson/model/ViewTest.java M test/src/test/java/hudson/security/CliAuthenticationTest.java M test/src/test/java/hudson/security/ExtendedReadPermissionTest.java M test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java M test/src/test/java/hudson/security/LoginTest.java M test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java M test/src/test/java/hudson/util/RobustReflectionConverterTest.java A test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java M test/src/test/java/jenkins/model/JenkinsTest.java A test/src/test/java/jenkins/security/ApiCrumbExclusionTest.java M test/src/test/java/jenkins/security/ApiTokenPropertyTest.java M test/src/test/java/jenkins/security/BasicHeaderProcessorTest.java M test/src/test/java/jenkins/security/Security218CliTest.java M test/src/test/java/jenkins/security/Security380Test.java A test/src/test/java/jenkins/security/SpySecurityListener.java M test/src/test/java/lib/form/PasswordTest.java A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins1/config.xml A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2/jenkins.install.InstallUtil.lastExecVersion A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerDependency.zip A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency.zip A test/src/test/resources/lib/form/PasswordTest/SecretNotPlainText/index.jelly R test/src/test/resources/lib/form/PasswordTest/test1.jelly M test/src/test/resources/lib/layout/RenderOnDemandTest/externalScript.jelly M war/pom.xml M war/src/main/webapp/favicon.ico A war/src/main/webapp/help/parameter/boolean-default_zh_CN.html A war/src/main/webapp/help/parameter/boolean_zh_CN.html A war/src/main/webapp/help/parameter/choice-choices_zh_CN.html A war/src/main/webapp/help/parameter/choice_zh_CN.html A war/src/main/webapp/help/parameter/description_zh_CN.html A war/src/main/webapp/help/parameter/file-name_zh_CN.html A war/src/main/webapp/help/parameter/file_zh_CN.html A war/src/main/webapp/help/parameter/name_zh_CN.html A war/src/main/webapp/help/parameter/run_zh_CN.html A war/src/main/webapp/help/parameter/string-default_zh_CN.html A war/src/main/webapp/help/parameter/string_zh_CN.html A war/src/main/webapp/help/parameter/trim_zh_CN.html A war/src/main/webapp/help/system-config/master-slave/availability_zh_CN.html A war/src/main/webapp/help/system-config/master-slave/demand/idleDelay_zh_CN.html A war/src/main/webapp/help/system-config/master-slave/demand/inDemandDelay_zh_CN.html A war/src/main/webapp/help/system-config/master-slave/description_zh_CN.html Log Message: ----------- Merge commit '99ca10114332e7c6fe12b676ea1919617070a488' into security-master Commit: 8fa79061bb0beaf93be4e05620463fd363ac5b30 https://github.com/jenkinsci/jenkins/commit/8fa79061bb0beaf93be4e05620463fd363ac5b30 Author: Alexander Akbashev <mr.akbas...@gmail.com> Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M core/src/main/java/hudson/security/Permission.java Log Message: ----------- [FIX JENKINS-48349] Cache permission id to avoid allocating of new strings Every request that comes from Jelly is checked against Permissions. As result it leads to a call of `getId` method that produces the new string. Usually it's not a problem, but in case of stop-the-world pause user requests are accumulated. So, once pause is finished, we forcibly allocated tons of strings for every request. That leads to new stop-the-world pause. (And this cycle can repeat multiple times) (cherry picked from commit b2c40cb9e0db72c978b3a50be0d4c467cb33eb20) Commit: 08444b29c608e759673d60be295bfe2858e1171a https://github.com/jenkinsci/jenkins/commit/08444b29c608e759673d60be295bfe2858e1171a Author: Oleg Nenashev <o.v.nenas...@gmail.com> Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M war/src/main/js/pluginSetupWizardGui.js Log Message: ----------- Merge pull request #3164 from fcojfernandez/JENKINS-48080 [JENKINS-48080] Setup Wizard hangs if confirm password is incorrect while creating admin user (cherry picked from commit b3ebef20ece11cd8cfed0eb32558065150a18c9d) Commit: 49ee85a1e7d63fd7e1fb63f78bbe12c26b91bce0 https://github.com/jenkinsci/jenkins/commit/49ee85a1e7d63fd7e1fb63f78bbe12c26b91bce0 Author: Jan Zuchhold <j...@zuchhold.com> Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M core/src/main/java/hudson/Functions.java Log Message: ----------- [JENKINS-48593] - Add getSystemProperty(key) to fix hudson.consoleTailKB system property (#3200) * Add getSystemProperty(key) to fix hudson.consoleTailKB system property * Add Javadoc, @Restricted and delegate to SystemProperties These changes were requested by @daniel-beck. * PR was not merged in time for 2.96 * Changes as requested by @oleg-nenashev (cherry picked from commit 006c51256e58d9b691956962d9fd624fb0c1e08b) Commit: 065d3c830361471651a6c59ff78a33f0f4aa0900 https://github.com/jenkinsci/jenkins/commit/065d3c830361471651a6c59ff78a33f0f4aa0900 Author: Johno Crawford <johno.crawf...@gmail.com> Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M core/src/main/java/jenkins/model/Jenkins.java Log Message: ----------- [JENKINS-48505] Invoke optimistic before computeIfAbsent to avoid contention. (cherry picked from commit dce450e1b4565b682f321329caea080293ef0b9b) Commit: 0319362666bb9e742c46a8fb28e70a660e53d4f3 https://github.com/jenkinsci/jenkins/commit/0319362666bb9e742c46a8fb28e70a660e53d4f3 Author: Oleg Nenashev <o.v.nenas...@gmail.com> Date: 2018-01-03 (Wed, 03 Jan 2018) Changed paths: M core/src/main/java/hudson/PluginManager.java M core/src/main/java/jenkins/install/InstallUtil.java M test/src/test/java/hudson/PluginManagerUtil.java A test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins1/config.xml A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2/jenkins.install.InstallUtil.lastExecVersion Log Message: ----------- Merge pull request #3193 from dwnusbaum/JENKINS-48365 [JENKINS-48365] Install detached plugins when upgrading Jenkins past the version the plugins were detached (cherry picked from commit 968b6adf007523ca7726e8161be65c9753c4df43) Commit: e9ecbb326c0e8974c9624fc623be2497299c377f https://github.com/jenkinsci/jenkins/commit/e9ecbb326c0e8974c9624fc623be2497299c377f Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-01-03 (Wed, 03 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/upgradeFromJenkins2WithNewerDependency.zip A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency.zip Log Message: ----------- Merge pull request #3201 from dwnusbaum/JENKINS-48604 [JENKINS-48604] Do not downgrade plugins that are dependencies of detached plugins when upgrading Jenkins (cherry picked from commit 1dc2c6d5ff666d60a0eb54125ce7694986d1025b) Commit: 847a2534ce7a63e2b0943d7f5ddbd4a612a69776 https://github.com/jenkinsci/jenkins/commit/847a2534ce7a63e2b0943d7f5ddbd4a612a69776 Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2018-01-17 (Wed, 17 Jan 2018) Changed paths: M cli/pom.xml M core/pom.xml M pom.xml M test/pom.xml M war/pom.xml Log Message: ----------- [maven-release-plugin] prepare release jenkins-2.89.3 Commit: 2904044e5105d415383305b802695ca059ed2153 https://github.com/jenkinsci/jenkins/commit/2904044e5105d415383305b802695ca059ed2153 Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2018-01-17 (Wed, 17 Jan 2018) Changed paths: M cli/pom.xml M core/pom.xml M pom.xml M test/pom.xml M war/pom.xml Log Message: ----------- [maven-release-plugin] prepare for next development iteration Commit: eb41a7bb0a58474a0fc627ca1cb8f2002ad26b47 https://github.com/jenkinsci/jenkins/commit/eb41a7bb0a58474a0fc627ca1cb8f2002ad26b47 Author: Alexander Akbashev <mr.akbas...@gmail.com> Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M core/src/main/java/hudson/model/Queue.java Log Message: ----------- [JENKINS-48348] If task can be run only on master, use shortcut Currently Jenkins to fire WorkflowJob re-calculates the ConstistentHash for entire cluster even if there is no nodes were updated. If cluster is big enough (>100 nodes), it becomes a problem, because MD5 is quite expensive itself plus all this logic comes with high memory footprint. Using the knowledge that WorkflowJob can be executed only on Jenkins master, we can create a shortcut that does not do expensive calculation and just returns Runnable or `null`. (cherry picked from commit 00ccd23f6441a55bfd625660911d4bc79c7578ba) Commit: e0ea7a648ed6970897ea2c49bc662439ec4e4110 https://github.com/jenkinsci/jenkins/commit/e0ea7a648ed6970897ea2c49bc662439ec4e4110 Author: Alexander Akbashev <mr.akbas...@gmail.com> Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M core/src/main/java/hudson/model/Executor.java Log Message: ----------- [JENKINS-48350] Cache estimated duration for execution In case of having 1000s of ongoing builds opening main pages can take some time if list of executors are opened. It happens because for every queury that comes from jelly we re-calculate the value from scratch. And calculation needs to load some builds from disk. The worst thing is that it happens for every user separately. (cherry picked from commit d7b120fea37b46b863c89acb638d04cdddc868b4) Commit: bed6ccd71921c9321919f7a042864dbbbf63243a https://github.com/jenkinsci/jenkins/commit/bed6ccd71921c9321919f7a042864dbbbf63243a Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-01-25 (Thu, 25 Jan 2018) Changed paths: M core/pom.xml M core/src/main/java/hudson/security/csrf/CrumbFilter.java A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.jelly A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.properties M test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java Log Message: ----------- Merge pull request #3187 from daniel-beck/JENKINS-34254-v2 [JENKINS-34254] Fix RequirePOST form (cherry picked from commit 76c9f8beacc681663571c925b5ee090222407e34) Commit: 6819252d4a2c54f5a510dea6c600574509ef2843 https://github.com/jenkinsci/jenkins/commit/6819252d4a2c54f5a510dea6c600574509ef2843 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M cli/pom.xml M core/pom.xml M core/src/main/java/hudson/Functions.java M core/src/main/java/hudson/PluginManager.java M core/src/main/java/hudson/model/Executor.java M core/src/main/java/hudson/model/Queue.java M core/src/main/java/hudson/security/Permission.java M core/src/main/java/hudson/security/csrf/CrumbFilter.java M core/src/main/java/jenkins/install/InstallUtil.java M core/src/main/java/jenkins/model/Jenkins.java A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.jelly A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.properties M pom.xml M test/pom.xml M test/src/test/java/hudson/PluginManagerUtil.java M test/src/test/java/hudson/security/csrf/DefaultCrumbIssuerTest.java A test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins1/config.xml A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2/jenkins.install.InstallUtil.lastExecVersion A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerDependency.zip A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency.zip M war/pom.xml M war/src/main/js/pluginSetupWizardGui.js Log Message: ----------- Merge branch 'stable-2.89' of git://github.com/jenkinsci/jenkins into stable-2.89 Commit: 1977ca2a08b2707c6372ed3a55b02db0d89cc239 https://github.com/jenkinsci/jenkins/commit/1977ca2a08b2707c6372ed3a55b02db0d89cc239 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M cli/pom.xml M core/pom.xml A core/src/filter/resources/jenkins/slaves/remoting-info.properties M core/src/main/java/hudson/ExtensionList.java M core/src/main/java/hudson/Launcher.java M core/src/main/java/hudson/PluginManager.java M core/src/main/java/hudson/TcpSlaveAgentListener.java M core/src/main/java/hudson/Util.java M core/src/main/java/hudson/XmlFile.java M core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java A core/src/main/java/hudson/lifecycle/ExitLifecycle.java M core/src/main/java/hudson/model/AbstractProject.java M core/src/main/java/hudson/model/Cause.java M core/src/main/java/hudson/model/Computer.java M core/src/main/java/hudson/model/ItemGroup.java M core/src/main/java/hudson/model/Queue.java M core/src/main/java/hudson/model/StringParameterDefinition.java M core/src/main/java/hudson/model/StringParameterValue.java M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/scm/SCM.java M core/src/main/java/hudson/security/AccessControlled.java M core/src/main/java/hudson/slaves/JNLPLauncher.java M core/src/main/java/hudson/slaves/OfflineCause.java M core/src/main/java/hudson/slaves/SlaveComputer.java M core/src/main/java/hudson/tools/ToolDescriptor.java M core/src/main/java/hudson/triggers/SCMTrigger.java M core/src/main/java/hudson/util/ArgumentListBuilder.java M core/src/main/java/hudson/util/AtomicFileWriter.java M core/src/main/java/hudson/util/DescribableList.java A core/src/main/java/hudson/util/FileChannelWriter.java M core/src/main/java/hudson/util/FormValidation.java M core/src/main/java/hudson/util/PluginServletFilter.java M core/src/main/java/hudson/util/TextFile.java M core/src/main/java/hudson/util/TimeUnit2.java M core/src/main/java/hudson/util/XStream2.java M core/src/main/java/jenkins/AgentProtocol.java M core/src/main/java/jenkins/MasterToSlaveFileCallable.java M core/src/main/java/jenkins/SlaveToMasterFileCallable.java M core/src/main/java/jenkins/install/SetupWizard.java M core/src/main/java/jenkins/model/Jenkins.java M core/src/main/java/jenkins/model/NewViewLink.java A core/src/main/java/jenkins/security/ClassFilterImpl.java A core/src/main/java/jenkins/security/CustomClassFilter.java M core/src/main/java/jenkins/security/MasterToSlaveCallable.java M core/src/main/java/jenkins/security/SlaveToMasterCallable.java M core/src/main/java/jenkins/security/csrf/CSRFAdministrativeMonitor.java M core/src/main/java/jenkins/slaves/DeprecatedAgentProtocolMonitor.java A core/src/main/java/jenkins/slaves/RemotingVersionInfo.java M core/src/main/java/jenkins/slaves/RemotingWorkDirSettings.java M core/src/main/java/jenkins/util/TimeDuration.java M core/src/main/resources/hudson/Messages_it.properties M core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly M core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.properties M core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly M core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.properties M core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly M core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.properties M core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly M core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.properties M core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.jelly M core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.properties M core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage.jelly M core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly M core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly M core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly M core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.properties M core/src/main/resources/hudson/logging/LogRecorderManager/levels_it.properties M core/src/main/resources/hudson/model/AbstractBuild/tasks_it.properties M core/src/main/resources/hudson/model/LoadStatistics/main.properties M core/src/main/resources/hudson/model/Messages.properties M core/src/main/resources/hudson/model/Messages_it.properties M core/src/main/resources/hudson/model/Messages_zh_CN.properties M core/src/main/resources/hudson/model/MyViewsProperty/config.properties M core/src/main/resources/hudson/model/StringParameterDefinition/config_it.properties M core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly M core/src/main/resources/hudson/model/View/builds_it.properties M core/src/main/resources/hudson/model/View/newJob.jelly M core/src/main/resources/hudson/model/View/newJob.properties A core/src/main/resources/hudson/model/View/newJobButtonBar_it.properties M core/src/main/resources/hudson/model/View/newJob_bg.properties M core/src/main/resources/hudson/model/View/newJob_fr.properties M core/src/main/resources/hudson/model/View/newJob_lt.properties M core/src/main/resources/hudson/model/View/newJob_pl.properties M core/src/main/resources/hudson/model/View/newJob_sr.properties M core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseLabelIsBusy/summary_it.properties M core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseLabelIsOffline/summary_it.properties M core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsBusy/summary_it.properties M core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsOffline/summary_it.properties M core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly M core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message.jelly M core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message.jelly M core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword.properties M core/src/main/resources/hudson/os/solaris/ZFSInstaller/message.jelly A core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_zh_CN.properties M core/src/main/resources/hudson/security/Messages.properties M core/src/main/resources/hudson/security/Messages_it.properties M core/src/main/resources/hudson/security/SecurityRealm/loginLink_es.properties M core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.properties A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry_it.properties M core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties M core/src/main/resources/hudson/slaves/Messages_it.properties M core/src/main/resources/hudson/tasks/Maven/help.properties M core/src/main/resources/hudson/tasks/Messages_it.properties M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly M core/src/main/resources/hudson/triggers/SCMTrigger/SCMAction/index_it.properties M core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_bg.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_de.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_fr.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_it.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_ja.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_nl.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_pt_BR.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_ru.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_tr.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_zh_TW.html M core/src/main/resources/hudson/util/AdministrativeError/message.jelly M core/src/main/resources/jenkins/CLI/WarnWhenEnabled/message.jelly M core/src/main/resources/jenkins/CLI/WarnWhenEnabled/message.properties M core/src/main/resources/jenkins/diagnosis/HsErrPidList/message.jelly M core/src/main/resources/jenkins/diagnostics/CompletedInitializationMonitor/message.jelly M core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly A core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token_zh_CN.properties A core/src/main/resources/jenkins/install/SetupWizard/proxy-configuration_zh_CN.properties A core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser_zh_CN.properties A core/src/main/resources/jenkins/install/UpgradeWizard/client-scripts_zh_CN.properties M core/src/main/resources/jenkins/install/pluginSetupWizard.properties A core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties M core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css M core/src/main/resources/jenkins/management/Messages.properties M core/src/main/resources/jenkins/management/PluginsLink/info.jelly A core/src/main/resources/jenkins/management/PluginsLink/info.properties M core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties M core/src/main/resources/jenkins/model/DownloadSettings/Warning/message.jelly M core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly M core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.properties M core/src/main/resources/jenkins/model/Jenkins/downgrade.jelly M core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_it.properties M core/src/main/resources/jenkins/model/Jenkins/loginError_zh_CN.properties M core/src/main/resources/jenkins/model/Jenkins/manage.jelly M core/src/main/resources/jenkins/model/Jenkins/noPrincipal.properties M core/src/main/resources/jenkins/model/Messages.properties M core/src/main/resources/jenkins/model/Messages_it.properties M core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy M core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.properties M core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy M core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.properties M core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly A core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message_it.properties A core/src/main/resources/jenkins/security/csrf/Messages_it.properties M core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly M core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.jelly M core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.properties A core/src/main/resources/jenkins/security/whitelisted-classes.txt M core/src/main/resources/jenkins/slaves/DeprecatedAgentProtocolMonitor/message.jelly M core/src/main/resources/jenkins/slaves/DeprecatedAgentProtocolMonitor/message.properties M core/src/main/resources/lib/form/helpLink_it.properties M core/src/main/resources/lib/form/section_.js A core/src/main/resources/lib/hudson/project/console-link_zh_CN.properties M core/src/main/resources/lib/layout/layout_it.properties M core/src/main/resources/lib/layout/pane_it.properties M core/src/test/java/hudson/util/AtomicFileWriterTest.java A core/src/test/java/hudson/util/DescribableListTest.java A core/src/test/java/hudson/util/FileChannelWriterTest.java M core/src/test/java/jenkins/model/NewViewLinkTest.java A core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java A core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java M pom.xml M test/pom.xml M test/src/test/java/hudson/model/ManagementLinkTest.java M test/src/test/java/hudson/util/AtomicFileWriterPerfTest.java R test/src/test/java/hudson/util/XStream2Security247Test.java M test/src/test/java/hudson/util/XStream2Security383Test.java M test/src/test/java/jenkins/install/InstallUtilTest.java M test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java M test/src/test/java/jenkins/install/SetupWizardTest.java M test/src/test/java/jenkins/model/JenkinsTest.java A test/src/test/java/jenkins/security/ClassFilterImplTest.java A test/src/test/java/jenkins/security/CustomClassFilterTest.java M test/src/test/java/jenkins/security/Security218CliTest.java M test/src/test/java/jenkins/security/Security218Test.java A test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java A test/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java R test/src/test/resources/hudson/util/XStream2Security247Test/config.xml A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin.zip A test/src/test/resources/plugins/custom-class-filter.jpi A test/src/test/resources/plugins/jenkins-47406.hpi M war/pom.xml A war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A war/src/main/webapp/bootstrap/config.json A war/src/main/webapp/bootstrap/css/bootstrap-theme.css A war/src/main/webapp/bootstrap/css/bootstrap-theme.min.css A war/src/main/webapp/bootstrap/css/bootstrap.css A war/src/main/webapp/bootstrap/css/bootstrap.min.css M war/src/main/webapp/css/style.css M war/src/main/webapp/favicon.ico M war/src/main/webapp/help/parameter/trim_zh_CN.html Log Message: ----------- Merge commit '53b9bdff752b97bece30d450697852cbf8089c6d' of git://github.com/jenkinsci/jenkins Commit: 921570c95f72cdc8335e05f2d18e0bcff5e9919d https://github.com/jenkinsci/jenkins/commit/921570c95f72cdc8335e05f2d18e0bcff5e9919d Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Log Message: ----------- Merge branch 'stable-2.89' Commit: 8923ea137cb1288973fe28c0504222c268f40854 https://github.com/jenkinsci/jenkins/commit/8923ea137cb1288973fe28c0504222c268f40854 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M cli/pom.xml M core/pom.xml A core/src/filter/resources/jenkins/slaves/remoting-info.properties M core/src/main/java/hudson/ExtensionList.java M core/src/main/java/hudson/Launcher.java M core/src/main/java/hudson/PluginManager.java M core/src/main/java/hudson/TcpSlaveAgentListener.java M core/src/main/java/hudson/Util.java M core/src/main/java/hudson/XmlFile.java M core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java A core/src/main/java/hudson/lifecycle/ExitLifecycle.java M core/src/main/java/hudson/model/AbstractProject.java M core/src/main/java/hudson/model/Cause.java M core/src/main/java/hudson/model/Computer.java M core/src/main/java/hudson/model/ItemGroup.java M core/src/main/java/hudson/model/Queue.java M core/src/main/java/hudson/model/StringParameterDefinition.java M core/src/main/java/hudson/model/StringParameterValue.java M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/scm/SCM.java M core/src/main/java/hudson/security/AccessControlled.java M core/src/main/java/hudson/slaves/JNLPLauncher.java M core/src/main/java/hudson/slaves/OfflineCause.java M core/src/main/java/hudson/slaves/SlaveComputer.java M core/src/main/java/hudson/tools/ToolDescriptor.java M core/src/main/java/hudson/triggers/SCMTrigger.java M core/src/main/java/hudson/util/ArgumentListBuilder.java M core/src/main/java/hudson/util/AtomicFileWriter.java M core/src/main/java/hudson/util/DescribableList.java A core/src/main/java/hudson/util/FileChannelWriter.java M core/src/main/java/hudson/util/FormValidation.java M core/src/main/java/hudson/util/PluginServletFilter.java M core/src/main/java/hudson/util/TextFile.java M core/src/main/java/hudson/util/TimeUnit2.java M core/src/main/java/hudson/util/XStream2.java M core/src/main/java/jenkins/AgentProtocol.java M core/src/main/java/jenkins/MasterToSlaveFileCallable.java M core/src/main/java/jenkins/SlaveToMasterFileCallable.java M core/src/main/java/jenkins/install/SetupWizard.java M core/src/main/java/jenkins/model/Jenkins.java M core/src/main/java/jenkins/model/NewViewLink.java A core/src/main/java/jenkins/security/ClassFilterImpl.java A core/src/main/java/jenkins/security/CustomClassFilter.java M core/src/main/java/jenkins/security/MasterToSlaveCallable.java M core/src/main/java/jenkins/security/SlaveToMasterCallable.java M core/src/main/java/jenkins/security/csrf/CSRFAdministrativeMonitor.java M core/src/main/java/jenkins/slaves/DeprecatedAgentProtocolMonitor.java A core/src/main/java/jenkins/slaves/RemotingVersionInfo.java M core/src/main/java/jenkins/slaves/RemotingWorkDirSettings.java M core/src/main/java/jenkins/util/TimeDuration.java M core/src/main/resources/hudson/Messages_it.properties M core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly M core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.properties M core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly M core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.properties M core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly M core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.properties M core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.jelly M core/src/main/resources/hudson/diagnosis/HudsonHomeDiskUsageMonitor/message.properties M core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.jelly M core/src/main/resources/hudson/diagnosis/NullIdDescriptorMonitor/message.properties M core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage.jelly M core/src/main/resources/hudson/diagnosis/OldDataMonitor/message.jelly M core/src/main/resources/hudson/diagnosis/ReverseProxySetupMonitor/message.jelly M core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.jelly M core/src/main/resources/hudson/diagnosis/TooManyJobsButNoView/message.properties M core/src/main/resources/hudson/logging/LogRecorderManager/levels_it.properties M core/src/main/resources/hudson/model/AbstractBuild/tasks_it.properties M core/src/main/resources/hudson/model/LoadStatistics/main.properties M core/src/main/resources/hudson/model/Messages.properties M core/src/main/resources/hudson/model/Messages_it.properties M core/src/main/resources/hudson/model/Messages_zh_CN.properties M core/src/main/resources/hudson/model/MyViewsProperty/config.properties M core/src/main/resources/hudson/model/StringParameterDefinition/config_it.properties M core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message.jelly M core/src/main/resources/hudson/model/View/builds_it.properties M core/src/main/resources/hudson/model/View/newJob.jelly M core/src/main/resources/hudson/model/View/newJob.properties A core/src/main/resources/hudson/model/View/newJobButtonBar_it.properties M core/src/main/resources/hudson/model/View/newJob_bg.properties M core/src/main/resources/hudson/model/View/newJob_fr.properties M core/src/main/resources/hudson/model/View/newJob_lt.properties M core/src/main/resources/hudson/model/View/newJob_pl.properties M core/src/main/resources/hudson/model/View/newJob_sr.properties M core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseLabelIsBusy/summary_it.properties M core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseLabelIsOffline/summary_it.properties M core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsBusy/summary_it.properties M core/src/main/resources/hudson/model/queue/CauseOfBlockage/BecauseNodeIsOffline/summary_it.properties M core/src/main/resources/hudson/node_monitors/MonitorMarkedNodeOffline/message.jelly M core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationCompleteNotice/message.jelly M core/src/main/resources/hudson/os/solaris/ZFSInstaller/MigrationFailedNotice/message.jelly M core/src/main/resources/hudson/os/solaris/ZFSInstaller/askRootPassword.properties M core/src/main/resources/hudson/os/solaris/ZFSInstaller/message.jelly A core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/firstUser_zh_CN.properties M core/src/main/resources/hudson/security/Messages.properties M core/src/main/resources/hudson/security/Messages_it.properties M core/src/main/resources/hudson/security/SecurityRealm/loginLink_es.properties M core/src/main/resources/hudson/security/csrf/CrumbFilter/retry.properties A core/src/main/resources/hudson/security/csrf/CrumbFilter/retry_it.properties M core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties M core/src/main/resources/hudson/slaves/Messages_it.properties M core/src/main/resources/hudson/tasks/Maven/help.properties M core/src/main/resources/hudson/tasks/Messages_it.properties M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly M core/src/main/resources/hudson/triggers/SCMTrigger/SCMAction/index_it.properties M core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_bg.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_de.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_fr.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_it.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_ja.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_nl.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_pt_BR.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_ru.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_tr.html R core/src/main/resources/hudson/triggers/SCMTrigger/help-pollingThreadCount_zh_TW.html M core/src/main/resources/hudson/util/AdministrativeError/message.jelly M core/src/main/resources/jenkins/CLI/WarnWhenEnabled/message.jelly M core/src/main/resources/jenkins/CLI/WarnWhenEnabled/message.properties M core/src/main/resources/jenkins/diagnosis/HsErrPidList/message.jelly M core/src/main/resources/jenkins/diagnostics/CompletedInitializationMonitor/message.jelly M core/src/main/resources/jenkins/diagnostics/SecurityIsOffMonitor/message.jelly A core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token_zh_CN.properties A core/src/main/resources/jenkins/install/SetupWizard/proxy-configuration_zh_CN.properties A core/src/main/resources/jenkins/install/SetupWizard/setupWizardFirstUser_zh_CN.properties A core/src/main/resources/jenkins/install/UpgradeWizard/client-scripts_zh_CN.properties M core/src/main/resources/jenkins/install/pluginSetupWizard.properties A core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties M core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css M core/src/main/resources/jenkins/management/Messages.properties M core/src/main/resources/jenkins/management/PluginsLink/info.jelly A core/src/main/resources/jenkins/management/PluginsLink/info.properties M core/src/main/resources/jenkins/model/CoreEnvironmentContributor/buildEnv.properties M core/src/main/resources/jenkins/model/DownloadSettings/Warning/message.jelly M core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly M core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.properties M core/src/main/resources/jenkins/model/Jenkins/downgrade.jelly M core/src/main/resources/jenkins/model/Jenkins/fingerprintCheck_it.properties M core/src/main/resources/jenkins/model/Jenkins/loginError_zh_CN.properties M core/src/main/resources/jenkins/model/Jenkins/manage.jelly M core/src/main/resources/jenkins/model/Jenkins/noPrincipal.properties M core/src/main/resources/jenkins/model/Messages.properties M core/src/main/resources/jenkins/model/Messages_it.properties M core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.groovy M core/src/main/resources/jenkins/security/RekeySecretAdminMonitor/message.properties M core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy M core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.properties M core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message.jelly A core/src/main/resources/jenkins/security/csrf/CSRFAdministrativeMonitor/message_it.properties A core/src/main/resources/jenkins/security/csrf/Messages_it.properties M core/src/main/resources/jenkins/security/s2m/AdminCallableMonitor/message.jelly M core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.jelly M core/src/main/resources/jenkins/security/s2m/MasterKillSwitchWarning/message.properties A core/src/main/resources/jenkins/security/whitelisted-classes.txt M core/src/main/resources/jenkins/slaves/DeprecatedAgentProtocolMonitor/message.jelly M core/src/main/resources/jenkins/slaves/DeprecatedAgentProtocolMonitor/message.properties M core/src/main/resources/lib/form/helpLink_it.properties M core/src/main/resources/lib/form/section_.js A core/src/main/resources/lib/hudson/project/console-link_zh_CN.properties M core/src/main/resources/lib/layout/layout_it.properties M core/src/main/resources/lib/layout/pane_it.properties M core/src/test/java/hudson/util/AtomicFileWriterTest.java A core/src/test/java/hudson/util/DescribableListTest.java A core/src/test/java/hudson/util/FileChannelWriterTest.java M core/src/test/java/jenkins/model/NewViewLinkTest.java A core/src/test/java/jenkins/security/ClassFilterImplSanityTest.java A core/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java M pom.xml M test/pom.xml M test/src/test/java/hudson/model/ManagementLinkTest.java M test/src/test/java/hudson/util/AtomicFileWriterPerfTest.java R test/src/test/java/hudson/util/XStream2Security247Test.java M test/src/test/java/hudson/util/XStream2Security383Test.java M test/src/test/java/jenkins/install/InstallUtilTest.java M test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java M test/src/test/java/jenkins/install/SetupWizardTest.java M test/src/test/java/jenkins/model/JenkinsTest.java A test/src/test/java/jenkins/security/ClassFilterImplTest.java A test/src/test/java/jenkins/security/CustomClassFilterTest.java M test/src/test/java/jenkins/security/Security218CliTest.java M test/src/test/java/jenkins/security/Security218Test.java A test/src/test/java/jenkins/slaves/OldRemotingAgentTest.java A test/src/test/java/jenkins/slaves/RemotingVersionInfoTest.java R test/src/test/resources/hudson/util/XStream2Security247Test/config.xml A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin.zip A test/src/test/resources/plugins/custom-class-filter.jpi A test/src/test/resources/plugins/jenkins-47406.hpi M war/pom.xml A war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml A war/src/main/webapp/bootstrap/config.json A war/src/main/webapp/bootstrap/css/bootstrap-theme.css A war/src/main/webapp/bootstrap/css/bootstrap-theme.min.css A war/src/main/webapp/bootstrap/css/bootstrap.css A war/src/main/webapp/bootstrap/css/bootstrap.min.css M war/src/main/webapp/css/style.css M war/src/main/webapp/favicon.ico M war/src/main/webapp/help/parameter/trim_zh_CN.html Log Message: ----------- Merge commit '53b9bdff752b97bece30d450697852cbf8089c6d' into security-master Commit: f4396a11d8011a4310f76a58a163f1d03b01a4fc https://github.com/jenkinsci/jenkins/commit/f4396a11d8011a4310f76a58a163f1d03b01a4fc Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Log Message: ----------- Merge branch 'security-stable-2.89' into security-master Commit: 2d16b459205730d85e51499c2457109b234ca9d9 https://github.com/jenkinsci/jenkins/commit/2d16b459205730d85e51499c2457109b234ca9d9 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M core/src/main/java/hudson/ProxyConfiguration.java Log Message: ----------- [SECURITY-506] Require admin permission to validate proxy config. Commit: eb03a42078f29dbed3742b8740c95e02890e4545 https://github.com/jenkinsci/jenkins/commit/eb03a42078f29dbed3742b8740c95e02890e4545 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- [SECURITY-705] Path traversal vulnerability in Plugin.doDynamic. Commit: 38249b561b61564830dcfe937351e54d53f5d394 https://github.com/jenkinsci/jenkins/commit/38249b561b61564830dcfe937351e54d53f5d394 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M core/src/main/resources/lib/form/option.jelly A test/src/test/java/lib/form/OptionTest.java A test/src/test/resources/lib/form/OptionTest/UsingGroovyView/index.groovy A test/src/test/resources/lib/form/OptionTest/UsingJellyView/index.jelly Log Message: ----------- [SECURITY-624] Stored XSS vulnerability in tool names. Commit: 00bf01eb17783675c41b86b0fc549590f812631e https://github.com/jenkinsci/jenkins/commit/00bf01eb17783675c41b86b0fc549590f812631e Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M core/src/main/java/hudson/ProxyConfiguration.java M core/src/main/resources/lib/form/option.jelly M test/src/test/java/hudson/PluginTest.java A test/src/test/java/lib/form/OptionTest.java A test/src/test/resources/lib/form/OptionTest/UsingGroovyView/index.groovy A test/src/test/resources/lib/form/OptionTest/UsingJellyView/index.jelly Log Message: ----------- Merge branch 'security-stable-2.46' into security-stable-2.60 Commit: 3173203b17d235a2c1a30875b72361b36897410c https://github.com/jenkinsci/jenkins/commit/3173203b17d235a2c1a30875b72361b36897410c Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M core/src/main/java/hudson/ProxyConfiguration.java M core/src/main/resources/lib/form/option.jelly M test/src/test/java/hudson/PluginTest.java A test/src/test/java/lib/form/OptionTest.java A test/src/test/resources/lib/form/OptionTest/UsingGroovyView/index.groovy A test/src/test/resources/lib/form/OptionTest/UsingJellyView/index.jelly Log Message: ----------- Merge branch 'security-stable-2.60' into security-stable-2.73 Commit: ac38a9c3989261b59b0137db893082971155628a https://github.com/jenkinsci/jenkins/commit/ac38a9c3989261b59b0137db893082971155628a Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M core/src/main/java/hudson/ProxyConfiguration.java M core/src/main/resources/lib/form/option.jelly M test/src/test/java/hudson/PluginTest.java A test/src/test/java/lib/form/OptionTest.java A test/src/test/resources/lib/form/OptionTest/UsingGroovyView/index.groovy A test/src/test/resources/lib/form/OptionTest/UsingJellyView/index.jelly Log Message: ----------- Merge branch 'security-stable-2.73' into security-stable-2.89 Commit: 09b839ca9bf63b64f9c000c220bc5697073c6090 https://github.com/jenkinsci/jenkins/commit/09b839ca9bf63b64f9c000c220bc5697073c6090 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-01-30 (Tue, 30 Jan 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M core/src/main/java/hudson/ProxyConfiguration.java M core/src/main/resources/lib/form/option.jelly M test/src/test/java/hudson/PluginTest.java A test/src/test/java/lib/form/OptionTest.java A test/src/test/resources/lib/form/OptionTest/UsingGroovyView/index.groovy A test/src/test/resources/lib/form/OptionTest/UsingJellyView/index.jelly Log Message: ----------- Merge branch 'security-stable-2.89' into security-master 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) Commit: 8830d68f5fe21f344be3496984bc4470bfcd0564 https://github.com/jenkinsci/jenkins/commit/8830d68f5fe21f344be3496984bc4470bfcd0564 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- [SECURITY-717] Plugin.doDynamic check for WEB-INF or META-INF should be case-insensitive. Commit: 4aa29f8b370bf36c217dd0883f93377f804f43de https://github.com/jenkinsci/jenkins/commit/4aa29f8b370bf36c217dd0883f93377f804f43de Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- Merge branch 'security-stable-2.46' into security-stable-2.60 Commit: d5fda65e3fe0dc2a07fbd8fc7f0257f640f098b7 https://github.com/jenkinsci/jenkins/commit/d5fda65e3fe0dc2a07fbd8fc7f0257f640f098b7 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- Merge branch 'security-stable-2.60' into security-stable-2.73 Commit: f4733a50ccef4204635eb2d4415dbfdfa30e4486 https://github.com/jenkinsci/jenkins/commit/f4733a50ccef4204635eb2d4415dbfdfa30e4486 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M core/src/main/java/hudson/PluginManager.java 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 M test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java A test/src/test/java/jenkins/install/SetupWizardRestartTest.java A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin.zip Log Message: ----------- Merge branch 'stable-2.89' of git://github.com/jenkinsci/jenkins into stable-2.89 Commit: 65f66f99d90843a6ca16c9365846e35c9da5e951 https://github.com/jenkinsci/jenkins/commit/65f66f99d90843a6ca16c9365846e35c9da5e951 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M core/src/main/java/hudson/PluginManager.java 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 M test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java A test/src/test/java/jenkins/install/SetupWizardRestartTest.java A test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin.zip Log Message: ----------- Merge branch 'stable-2.89' into security-stable-2.89 Commit: d69cf66948b21a09ccbcbb033f8e07d4bd1f6818 https://github.com/jenkinsci/jenkins/commit/d69cf66948b21a09ccbcbb033f8e07d4bd1f6818 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- Merge branch 'security-stable-2.73' into security-stable-2.89 Commit: d8bc3dc358f0aa08a572911b6ffa63c6c214b550 https://github.com/jenkinsci/jenkins/commit/d8bc3dc358f0aa08a572911b6ffa63c6c214b550 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-08 (Thu, 08 Feb 2018) Log Message: ----------- Merge branch 'stable-2.89' Commit: cc398b7c525d977544e1fd077867f01ef089a6b4 https://github.com/jenkinsci/jenkins/commit/cc398b7c525d977544e1fd077867f01ef089a6b4 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-08 (Thu, 08 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- Merge branch 'security-stable-2.89' into security-master Commit: 9de62915807deab61d6e780eed660428f9889b51 https://github.com/jenkinsci/jenkins/commit/9de62915807deab61d6e780eed660428f9889b51 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-09 (Fri, 09 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- [SECURITY-705] Additional precautions. Commit: 19b71d8d299103f5f035054db76d8551bb94b217 https://github.com/jenkinsci/jenkins/commit/19b71d8d299103f5f035054db76d8551bb94b217 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-09 (Fri, 09 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- Merge branch 'security-stable-2.46' into security-stable-2.60 Commit: 2817d237c28c5b65f9d3c5d408fc8aa53dec6314 https://github.com/jenkinsci/jenkins/commit/2817d237c28c5b65f9d3c5d408fc8aa53dec6314 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-09 (Fri, 09 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- Merge branch 'security-stable-2.60' into security-stable-2.73 Commit: 60afa21e656d86e46ecb48a89723d547755e298a https://github.com/jenkinsci/jenkins/commit/60afa21e656d86e46ecb48a89723d547755e298a Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-09 (Fri, 09 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- Merge branch 'security-stable-2.73' into security-stable-2.89 Commit: 864a93fe89f4538dedcc60be0b769d5b89cc6f90 https://github.com/jenkinsci/jenkins/commit/864a93fe89f4538dedcc60be0b769d5b89cc6f90 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2018-02-09 (Fri, 09 Feb 2018) Changed paths: M core/src/main/java/hudson/Plugin.java M test/src/test/java/hudson/PluginTest.java Log Message: ----------- Merge branch 'security-stable-2.89' into security-master Commit: f7b2687c84cd30caf961780ae7e62db0b874dc9d https://github.com/jenkinsci/jenkins/commit/f7b2687c84cd30caf961780ae7e62db0b874dc9d Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-02-12 (Mon, 12 Feb 2018) Changed paths: M cli/pom.xml M core/pom.xml M core/src/main/java/hudson/FilePath.java M core/src/main/java/hudson/Main.java M core/src/main/java/hudson/PluginWrapper.java M core/src/main/java/hudson/XmlFile.java M core/src/main/java/hudson/model/Computer.java M core/src/main/java/hudson/model/Fingerprint.java M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/model/View.java M core/src/main/java/hudson/security/ACL.java M core/src/main/java/hudson/security/AuthorizationStrategy.java M core/src/main/java/hudson/security/LegacySecurityRealm.java M core/src/main/java/hudson/slaves/SlaveComputer.java A core/src/main/java/hudson/util/ClassLoaderSanityThreadFactory.java M core/src/main/java/hudson/util/XStream2.java M core/src/main/java/jenkins/model/Jenkins.java M core/src/main/java/jenkins/model/MasterBuildConfiguration.java M core/src/main/java/jenkins/util/Timer.java M core/src/main/java/jenkins/util/xstream/XStreamDOM.java M core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly M core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.properties M core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure.jelly M core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy M core/src/main/resources/jenkins/model/Messages.properties A core/src/test/java/hudson/XmlFileTest.java M core/src/test/java/hudson/model/TaskActionTest.java M core/src/test/java/hudson/util/AtomicFileWriterTest.java M core/src/test/java/hudson/util/XStream2Test.java M core/src/test/java/jenkins/util/TimerTest.java A core/src/test/resources/hudson/config_1_0.xml A core/src/test/resources/hudson/config_1_0_with_special_chars.xml A core/src/test/resources/hudson/config_1_1.xml A core/src/test/resources/hudson/config_1_1_with_special_chars.xml M pom.xml M test/pom.xml A test/src/test/java/hudson/XMLFileTest.java M test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java M test/src/test/java/hudson/cli/GetNodeCommandTest.java M test/src/test/java/hudson/cli/GetViewCommandTest.java M test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java M test/src/test/java/hudson/util/RobustReflectionConverterTest.java M test/src/test/java/jenkins/security/Security218Test.java M test/src/test/java/jenkins/security/s2m/DefaultFilePathFilterTest.java A test/src/test/resources/hudson/XMLFileTest/canStartWithXml_1_1_ConfigsTest/config.xml A test/src/test/resources/hudson/XMLFileTest/silentlyMigrateConfigsTest/config.xml M war/pom.xml M war/src/main/webapp/scripts/hudson-behavior.js Log Message: ----------- Merge commit 'f8a2309b0260df89a03a91ccf976e6be999c1c02' of git://github.com/jenkinsci/jenkins Commit: 028495091302827918eb4a530366182717c4e092 https://github.com/jenkinsci/jenkins/commit/028495091302827918eb4a530366182717c4e092 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-02-12 (Mon, 12 Feb 2018) Changed paths: M cli/pom.xml M core/pom.xml M core/src/main/java/hudson/FilePath.java M core/src/main/java/hudson/Main.java M core/src/main/java/hudson/PluginWrapper.java M core/src/main/java/hudson/XmlFile.java M core/src/main/java/hudson/model/Computer.java M core/src/main/java/hudson/model/Fingerprint.java M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/model/View.java M core/src/main/java/hudson/security/ACL.java M core/src/main/java/hudson/security/AuthorizationStrategy.java M core/src/main/java/hudson/security/LegacySecurityRealm.java M core/src/main/java/hudson/slaves/SlaveComputer.java A core/src/main/java/hudson/util/ClassLoaderSanityThreadFactory.java M core/src/main/java/hudson/util/XStream2.java M core/src/main/java/jenkins/model/Jenkins.java M core/src/main/java/jenkins/model/MasterBuildConfiguration.java M core/src/main/java/jenkins/util/Timer.java M core/src/main/java/jenkins/util/xstream/XStreamDOM.java M core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.jelly M core/src/main/resources/hudson/PluginWrapper/PluginWrapperAdministrativeMonitor/message.properties M core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure.jelly M core/src/main/resources/jenkins/model/MasterBuildConfiguration/config.groovy M core/src/main/resources/jenkins/model/Messages.properties A core/src/test/java/hudson/XmlFileTest.java M core/src/test/java/hudson/model/TaskActionTest.java M core/src/test/java/hudson/util/AtomicFileWriterTest.java M core/src/test/java/hudson/util/XStream2Test.java M core/src/test/java/jenkins/util/TimerTest.java A core/src/test/resources/hudson/config_1_0.xml A core/src/test/resources/hudson/config_1_0_with_special_chars.xml A core/src/test/resources/hudson/config_1_1.xml A core/src/test/resources/hudson/config_1_1_with_special_chars.xml M pom.xml M test/pom.xml A test/src/test/java/hudson/XMLFileTest.java M test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java M test/src/test/java/hudson/cli/GetNodeCommandTest.java M test/src/test/java/hudson/cli/GetViewCommandTest.java M test/src/test/java/hudson/model/ComputerConfigDotXmlTest.java M test/src/test/java/hudson/util/RobustReflectionConverterTest.java M test/src/test/java/jenkins/security/Security218Test.java M test/src/test/java/jenkins/security/s2m/DefaultFilePathFilterTest.java A test/src/test/resources/hudson/XMLFileTest/canStartWithXml_1_1_ConfigsTest/config.xml A test/src/test/resources/hudson/XMLFileTest/silentlyMigrateConfigsTest/config.xml M war/pom.xml M war/src/main/webapp/scripts/hudson-behavior.js Log Message: ----------- Merge commit 'f8a2309b0260df89a03a91ccf976e6be999c1c02' into security-master Commit: 404bbaee7990209097be1b4ae59bd791ff54f90e https://github.com/jenkinsci/jenkins/commit/404bbaee7990209097be1b4ae59bd791ff54f90e Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2018-02-12 (Mon, 12 Feb 2018) Changed paths: M cli/pom.xml M core/pom.xml M pom.xml M test/pom.xml M war/pom.xml Log Message: ----------- [maven-release-plugin] prepare release jenkins-2.107 Commit: 6bb6436c55f43bc7bacf1360cf6bbf3c91f9ad89 https://github.com/jenkinsci/jenkins/commit/6bb6436c55f43bc7bacf1360cf6bbf3c91f9ad89 Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2018-02-12 (Mon, 12 Feb 2018) Changed paths: M cli/pom.xml M core/pom.xml M pom.xml M test/pom.xml M war/pom.xml Log Message: ----------- [maven-release-plugin] prepare for next development iteration Commit: bc626820fde1ef3f8bd723e756eed360e9b13a74 https://github.com/jenkinsci/jenkins/commit/bc626820fde1ef3f8bd723e756eed360e9b13a74 Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2018-02-13 (Tue, 13 Feb 2018) Log Message: ----------- Merge remote-tracking branch 'security/master' Not sure why the CERT master branch has diverged from the jenkinsci/jenkins master but Daniel thinks it's a side-effect of the CERT branch handling script. Indeed only commits that are merging here are merge commits themselves. Commit: 09e1f8cd0ca173f3526f016e9ff18410fb422807 https://github.com/jenkinsci/jenkins/commit/09e1f8cd0ca173f3526f016e9ff18410fb422807 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-02-14 (Wed, 14 Feb 2018) Changed paths: M cli/pom.xml M core/pom.xml M core/src/main/java/hudson/Plugin.java M core/src/main/java/hudson/ProxyConfiguration.java M core/src/main/resources/lib/form/option.jelly M pom.xml M test/pom.xml M test/src/test/java/hudson/PluginTest.java A test/src/test/java/lib/form/OptionTest.java A test/src/test/resources/lib/form/OptionTest/UsingGroovyView/index.groovy A test/src/test/resources/lib/form/OptionTest/UsingJellyView/index.jelly M war/pom.xml Log Message: ----------- Merge branch 'master' of github.com:jenkinsci-cert/jenkins Compare: https://github.com/jenkinsci/jenkins/compare/2897239e4af8...09e1f8cd0ca1 -- 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.