Branch: refs/tags/jenkins-2.154 Home: https://github.com/jenkinsci/jenkins Commit: b7b580bda3581d29e6b905aa921c6b0f7e6cb53c https://github.com/jenkinsci/jenkins/commit/b7b580bda3581d29e6b905aa921c6b0f7e6cb53c Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-20 (Tue, 20 Nov 2018)
Log Message: ----------- Merge branch 'stable-2.138' Commit: 377bc7f9b549a19fe345cd72b74048566456bcc8 https://github.com/jenkinsci/jenkins/commit/377bc7f9b549a19fe345cd72b74048566456bcc8 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-20 (Tue, 20 Nov 2018) Log Message: ----------- Merge branch 'security-stable-2.138' into security-master Commit: 7bdefbed29b6983d5bfd41b72e46b8b831cc68bd https://github.com/jenkinsci/jenkins/commit/7bdefbed29b6983d5bfd41b72e46b8b831cc68bd Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-20 (Tue, 20 Nov 2018) Log Message: ----------- Merge (-s ours) stable-2.138 into stable-2.150 Commit: a3bf6f932fc2e7c4eb6728423dff1ac5e100344f https://github.com/jenkinsci/jenkins/commit/a3bf6f932fc2e7c4eb6728423dff1ac5e100344f Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-20 (Tue, 20 Nov 2018) Log Message: ----------- Merge (-s ours) stable-2.150 into master Commit: 586eb176b0e1cb845582683419afbaceb26e7b9f https://github.com/jenkinsci/jenkins/commit/586eb176b0e1cb845582683419afbaceb26e7b9f Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-20 (Tue, 20 Nov 2018) Log Message: ----------- Merge master into security-master Commit: 69eacee9649288879354a73dcfc630b3b8083169 https://github.com/jenkinsci/jenkins/commit/69eacee9649288879354a73dcfc630b3b8083169 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-21 (Wed, 21 Nov 2018) Changed paths: M core/src/main/java/hudson/FilePath.java M core/src/main/java/hudson/model/DirectoryBrowserSupport.java M core/src/main/java/hudson/model/Run.java M core/src/main/java/hudson/model/User.java A core/src/main/java/hudson/model/UserIdMapper.java A core/src/main/java/hudson/model/UserIdMigrator.java M core/src/main/java/hudson/scheduler/CronTab.java M core/src/main/java/jenkins/model/IdStrategy.java M core/src/main/java/jenkins/util/VirtualFile.java A core/src/test/java/hudson/FilePathSEC904Test.java A core/src/test/java/hudson/UtilSEC904Test.java A core/src/test/java/hudson/model/TestUserIdMapper.java A core/src/test/java/hudson/model/UserIdMapperTest.java A core/src/test/java/hudson/model/UserIdMigratorTest.java M core/src/test/java/hudson/scheduler/CronTabTest.java M core/src/test/java/jenkins/model/IdStrategyTest.java A core/src/test/java/jenkins/util/VirtualFileSEC904Test.java A core/src/test/resources/hudson/model/UserIdMapperTest/testDuplicatedUserId/users/users.xml A core/src/test/resources/hudson/model/UserIdMapperTest/testXmlFileCorrupted/users/users.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/emptyUsernameConfigScanned/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/emptyUsernameConfigScanned/users/admin/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/emptyUsernameConfigScanned/users/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateEntireDirectory/users/fred/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateEntireDirectory/users/fred/otherfile.txt A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/foo$002fbar/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/fred/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/zzzက/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateSimpleUser/users/fred/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateUsersXml/users/users.xml/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/needsMigrationBasic/users/jane_4975613142751794216/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/needsMigrationFalse/users/users.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/needsMigrationNoUserConfigFiles/users/users.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersBasic/users/admin/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersBasic/users/jane/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersCaseSensitive/users/Fred/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersCaseSensitive/users/admin/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersCaseSensitive/users/~jane/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/$002e$002e/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/$002f/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/big$money/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/bla$0024phem.us/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/foo$002fbar$002fbaz/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/foo$002fbar/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/make$00241000000/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/~com1/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersOldLegacy/users/makeက000/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersOldLegacy/users/zzzက/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersOldLegacy/users/ကyyy/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersOldLegacy/users/は国内で最大/config.xml M test/src/test/java/hudson/cli/ReloadConfigurationCommandTest.java A test/src/test/java/hudson/model/DirectoryBrowserSupportSEC904Test.java A test/src/test/java/hudson/model/UserIdMigratorTest.java M test/src/test/java/hudson/model/UserPropertyTest.java M test/src/test/java/hudson/model/UserTest.java M test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java M test/src/test/java/hudson/tasks/ArtifactArchiverTest.java M test/src/test/java/jenkins/model/JenkinsReloadConfigurationTest.java A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/insideWorkspaceStructure.bat A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/insideWorkspaceStructure.sh A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/outsideWorkspaceStructure.bat A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/outsideWorkspaceStructure.sh A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/outsideWorkspaceStructureWithJunctions.bat M test/src/test/resources/hudson/model/JobTest/readPermission.zip A test/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/foo$002fbar/config.xml A test/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/fred/config.xml A test/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/zzzက/config.xml A test/src/test/resources/hudson/model/UserIdMigratorTest/migrateSimpleUser/users/fred/config.xml R test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/users/nestedUserReference/config.xml A test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/users/user4975613142751794216/config.xml A test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/users/users.xml A test/src/test/resources/hudson/model/UserTest/corruptConfigFile/users/user4975613142751794216/config.xml A test/src/test/resources/hudson/model/UserTest/corruptConfigFile/users/users.xml A test/src/test/resources/hudson/model/UserTest/differentUserIdInConfigFileIsIgnored/users/user4975613142751794216/config.xml A test/src/test/resources/hudson/model/UserTest/differentUserIdInConfigFileIsIgnored/users/users.xml R test/src/test/resources/hudson/model/UserTest/emptyUsernameConfigMigrated/config.xml R test/src/test/resources/hudson/model/UserTest/emptyUsernameConfigMigrated/users/admin/config.xml R test/src/test/resources/hudson/model/UserTest/emptyUsernameConfigMigrated/users/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/admin/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/foo/bar/baz/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/foo/bar/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/foo/baz/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/foo/config.xml R test/src/test/resources/hudson/model/UserTest/migration.zip R test/src/test/resources/hudson/model/UserTest/shellyUsernameMigrated.zip R test/src/test/resources/hudson/security/ExtendedReadPermissionTest.zip A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/jobs/a/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/secret.key A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/user11111111111111/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/user2222222222222/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/user4975613142751794216/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/user8888888888888888888/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/users.xml Log Message: ----------- Merge branch 'security-stable-2.138' into security-stable-2.150 Commit: 9c7c4d930f59b2c207cac19df7cef4e34b648a60 https://github.com/jenkinsci/jenkins/commit/9c7c4d930f59b2c207cac19df7cef4e34b648a60 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-21 (Wed, 21 Nov 2018) Changed paths: M core/src/main/java/hudson/FilePath.java M core/src/main/java/hudson/model/DirectoryBrowserSupport.java M core/src/main/java/hudson/model/Run.java M core/src/main/java/hudson/model/User.java A core/src/main/java/hudson/model/UserIdMapper.java A core/src/main/java/hudson/model/UserIdMigrator.java M core/src/main/java/hudson/scheduler/CronTab.java M core/src/main/java/jenkins/model/IdStrategy.java M core/src/main/java/jenkins/util/VirtualFile.java A core/src/test/java/hudson/FilePathSEC904Test.java A core/src/test/java/hudson/UtilSEC904Test.java A core/src/test/java/hudson/model/TestUserIdMapper.java A core/src/test/java/hudson/model/UserIdMapperTest.java A core/src/test/java/hudson/model/UserIdMigratorTest.java M core/src/test/java/hudson/scheduler/CronTabTest.java M core/src/test/java/jenkins/model/IdStrategyTest.java A core/src/test/java/jenkins/util/VirtualFileSEC904Test.java A core/src/test/resources/hudson/model/UserIdMapperTest/testDuplicatedUserId/users/users.xml A core/src/test/resources/hudson/model/UserIdMapperTest/testXmlFileCorrupted/users/users.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/emptyUsernameConfigScanned/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/emptyUsernameConfigScanned/users/admin/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/emptyUsernameConfigScanned/users/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateEntireDirectory/users/fred/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateEntireDirectory/users/fred/otherfile.txt A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/foo$002fbar/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/fred/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/zzzက/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateSimpleUser/users/fred/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/migrateUsersXml/users/users.xml/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/needsMigrationBasic/users/jane_4975613142751794216/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/needsMigrationFalse/users/users.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/needsMigrationNoUserConfigFiles/users/users.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersBasic/users/admin/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersBasic/users/jane/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersCaseSensitive/users/Fred/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersCaseSensitive/users/admin/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersCaseSensitive/users/~jane/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/$002e$002e/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/$002f/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/big$money/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/bla$0024phem.us/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/foo$002fbar$002fbaz/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/foo$002fbar/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/make$00241000000/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersLegacy/users/~com1/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersOldLegacy/users/makeက000/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersOldLegacy/users/zzzက/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersOldLegacy/users/ကyyy/config.xml A core/src/test/resources/hudson/model/UserIdMigratorTest/scanExistingUsersOldLegacy/users/は国内で最大/config.xml M test/src/test/java/hudson/cli/ReloadConfigurationCommandTest.java A test/src/test/java/hudson/model/DirectoryBrowserSupportSEC904Test.java A test/src/test/java/hudson/model/UserIdMigratorTest.java M test/src/test/java/hudson/model/UserPropertyTest.java M test/src/test/java/hudson/model/UserTest.java M test/src/test/java/hudson/security/HudsonPrivateSecurityRealmTest.java M test/src/test/java/hudson/tasks/ArtifactArchiverTest.java M test/src/test/java/jenkins/model/JenkinsReloadConfigurationTest.java A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/insideWorkspaceStructure.bat A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/insideWorkspaceStructure.sh A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/outsideWorkspaceStructure.bat A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/outsideWorkspaceStructure.sh A test/src/test/resources/hudson/model/DirectoryBrowserSupportSEC904Test/outsideWorkspaceStructureWithJunctions.bat M test/src/test/resources/hudson/model/JobTest/readPermission.zip A test/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/foo$002fbar/config.xml A test/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/fred/config.xml A test/src/test/resources/hudson/model/UserIdMigratorTest/migrateMultipleUsers/users/zzzက/config.xml A test/src/test/resources/hudson/model/UserIdMigratorTest/migrateSimpleUser/users/fred/config.xml R test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/users/nestedUserReference/config.xml A test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/users/user4975613142751794216/config.xml A test/src/test/resources/hudson/model/UserPropertyTest/nestedUserReference/users/users.xml A test/src/test/resources/hudson/model/UserTest/corruptConfigFile/users/user4975613142751794216/config.xml A test/src/test/resources/hudson/model/UserTest/corruptConfigFile/users/users.xml A test/src/test/resources/hudson/model/UserTest/differentUserIdInConfigFileIsIgnored/users/user4975613142751794216/config.xml A test/src/test/resources/hudson/model/UserTest/differentUserIdInConfigFileIsIgnored/users/users.xml R test/src/test/resources/hudson/model/UserTest/emptyUsernameConfigMigrated/config.xml R test/src/test/resources/hudson/model/UserTest/emptyUsernameConfigMigrated/users/admin/config.xml R test/src/test/resources/hudson/model/UserTest/emptyUsernameConfigMigrated/users/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/admin/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/foo/bar/baz/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/foo/bar/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/foo/baz/config.xml R test/src/test/resources/hudson/model/UserTest/legacyUserConfigDirsMigrated/users/foo/config.xml R test/src/test/resources/hudson/model/UserTest/migration.zip R test/src/test/resources/hudson/model/UserTest/shellyUsernameMigrated.zip R test/src/test/resources/hudson/security/ExtendedReadPermissionTest.zip A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/jobs/a/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/secret.key A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/user11111111111111/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/user2222222222222/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/user4975613142751794216/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/user8888888888888888888/config.xml A test/src/test/resources/hudson/security/ExtendedReadPermissionTest/users/users.xml Log Message: ----------- Merge branch 'security-stable-2.150' into security-master Commit: 90b6d47af7ff0ae33f4ff816a0d9ca36223769b0 https://github.com/jenkinsci/jenkins/commit/90b6d47af7ff0ae33f4ff816a0d9ca36223769b0 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-21 (Wed, 21 Nov 2018) Changed paths: M core/pom.xml M core/src/main/java/hudson/ProxyConfiguration.java M core/src/main/java/hudson/TcpSlaveAgentListener.java M core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java M core/src/main/java/hudson/model/Computer.java M core/src/main/java/hudson/model/ModelObject.java M core/src/main/java/hudson/model/ParameterValue.java M core/src/main/java/hudson/model/Queue.java M core/src/main/java/hudson/model/UpdateCenter.java M core/src/main/java/hudson/model/View.java M core/src/main/java/hudson/security/AuthorizationStrategy.java M core/src/main/java/hudson/security/csrf/CrumbIssuer.java M core/src/main/java/jenkins/diagnosis/HsErrPidList.java M core/src/main/java/jenkins/install/InstallState.java M core/src/main/java/jenkins/model/Jenkins.java A core/src/main/java/jenkins/security/stapler/DoActionFilter.java A core/src/main/java/jenkins/security/stapler/RoutingDecisionProvider.java A core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java A core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java A core/src/main/java/jenkins/security/stapler/TypedFilter.java A core/src/main/java/jenkins/security/stapler/WebMethodConstants.java A core/src/main/resources/jenkins/security/stapler/default-whitelist.txt A core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java M test/pom.xml M test/src/test/java/hudson/model/ViewTest.java M test/src/test/java/hudson/util/FormFieldValidatorTest.java A test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java A test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java A test/src/test/java/jenkins/security/stapler/DynamicTest.java A test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java A test/src/test/java/jenkins/security/stapler/JenkinsSupportAnnotationsTest.java A test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java A test/src/test/java/jenkins/security/stapler/Security400Test.java A test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java A test/src/test/java/jenkins/security/stapler/StaplerRoutableActionTest.java A test/src/test/java/jenkins/security/stapler/StaplerRoutableFieldTest.java A test/src/test/java/jenkins/security/stapler/StaplerRoutableGetterTest.java A test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProvider2Test.java A test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java A test/src/test/java/jenkins/security/stapler/TypedFilterTest.java M test/src/test/resources/hudson/model/UsageStatisticsTest/jobs.json A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/comment_ignored/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/greylist_multiline/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/whitelist_empty/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/whitelist_emptyline/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/whitelist_monoline/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/whitelist_multiline/stapler-whitelist.txt A test/src/test/resources/plugins/annotations-test-sources.jar A test/src/test/resources/plugins/annotations-test.hpi Log Message: ----------- Merge branch 'security-stable-2.138' into security-stable-2.150 Commit: db5defdf2f3c8efa4c8fb5a04502ebbccec96504 https://github.com/jenkinsci/jenkins/commit/db5defdf2f3c8efa4c8fb5a04502ebbccec96504 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-21 (Wed, 21 Nov 2018) Changed paths: M core/pom.xml M core/src/main/java/hudson/ProxyConfiguration.java M core/src/main/java/hudson/TcpSlaveAgentListener.java M core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java M core/src/main/java/hudson/model/Computer.java M core/src/main/java/hudson/model/ModelObject.java M core/src/main/java/hudson/model/ParameterValue.java M core/src/main/java/hudson/model/Queue.java M core/src/main/java/hudson/model/UpdateCenter.java M core/src/main/java/hudson/model/View.java M core/src/main/java/hudson/security/AuthorizationStrategy.java M core/src/main/java/hudson/security/csrf/CrumbIssuer.java M core/src/main/java/jenkins/diagnosis/HsErrPidList.java M core/src/main/java/jenkins/install/InstallState.java M core/src/main/java/jenkins/model/Jenkins.java A core/src/main/java/jenkins/security/stapler/DoActionFilter.java A core/src/main/java/jenkins/security/stapler/RoutingDecisionProvider.java A core/src/main/java/jenkins/security/stapler/StaplerFilteredActionListener.java A core/src/main/java/jenkins/security/stapler/StaticRoutingDecisionProvider.java A core/src/main/java/jenkins/security/stapler/TypedFilter.java A core/src/main/java/jenkins/security/stapler/WebMethodConstants.java A core/src/main/resources/jenkins/security/stapler/default-whitelist.txt A core/src/test/java/jenkins/security/stapler/StaplerSignaturesTest.java M test/pom.xml M test/src/test/java/hudson/model/ViewTest.java M test/src/test/java/hudson/util/FormFieldValidatorTest.java A test/src/test/java/jenkins/security/stapler/CustomRoutingDecisionProviderTest.java A test/src/test/java/jenkins/security/stapler/DoActionFilterTest.java A test/src/test/java/jenkins/security/stapler/DynamicTest.java A test/src/test/java/jenkins/security/stapler/GetterMethodFilterTest.java A test/src/test/java/jenkins/security/stapler/JenkinsSupportAnnotationsTest.java A test/src/test/java/jenkins/security/stapler/PreventRoutingTest.java A test/src/test/java/jenkins/security/stapler/Security400Test.java A test/src/test/java/jenkins/security/stapler/StaplerAbstractTest.java A test/src/test/java/jenkins/security/stapler/StaplerRoutableActionTest.java A test/src/test/java/jenkins/security/stapler/StaplerRoutableFieldTest.java A test/src/test/java/jenkins/security/stapler/StaplerRoutableGetterTest.java A test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProvider2Test.java A test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java A test/src/test/java/jenkins/security/stapler/TypedFilterTest.java M test/src/test/resources/hudson/model/UsageStatisticsTest/jobs.json A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/comment_ignored/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/greylist_multiline/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/whitelist_empty/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/whitelist_emptyline/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/whitelist_monoline/stapler-whitelist.txt A test/src/test/resources/jenkins/security/stapler/StaticRoutingDecisionProvider2Test/whitelist_multiline/stapler-whitelist.txt A test/src/test/resources/plugins/annotations-test-sources.jar A test/src/test/resources/plugins/annotations-test.hpi Log Message: ----------- Merge branch 'security-stable-2.150' into security-master Commit: af455a6291b45a51bb311c999a5701a115442be4 https://github.com/jenkinsci/jenkins/commit/af455a6291b45a51bb311c999a5701a115442be4 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-22 (Thu, 22 Nov 2018) Changed paths: M cli/src/main/java/hudson/cli/CLI.java M core/src/main/java/hudson/Functions.java M test/src/test/java/hudson/cli/CLITest.java M test/src/test/java/hudson/console/ConsoleAnnotatorTest.java A test/src/test/resources/hudson/cli/huge-stdin.txt Log Message: ----------- Merge branch 'stable-2.150' of https://github.com/jenkinsci/jenkins into stable-2.150 Commit: 79384efd22add6534589af036be66a86c6ff2c7b https://github.com/jenkinsci/jenkins/commit/79384efd22add6534589af036be66a86c6ff2c7b Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-23 (Fri, 23 Nov 2018) Changed paths: M cli/src/main/java/hudson/cli/CLI.java M core/src/main/java/hudson/Functions.java M test/src/test/java/hudson/cli/CLITest.java M test/src/test/java/hudson/console/ConsoleAnnotatorTest.java A test/src/test/resources/hudson/cli/huge-stdin.txt Log Message: ----------- Merge branch 'stable-2.150' into security-stable-2.150 Commit: 204472671647e625843239e4eff0720c666bdbc0 https://github.com/jenkinsci/jenkins/commit/204472671647e625843239e4eff0720c666bdbc0 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-23 (Fri, 23 Nov 2018) Changed paths: M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/model/UserIdMapper.java M core/src/main/java/jenkins/security/ApiTokenProperty.java M core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java M core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java A test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java Log Message: ----------- Merge branch 'security-stable-2.138' into security-stable-2.150 Commit: 896356a03893c300361dd8a3acc3b83f926301b7 https://github.com/jenkinsci/jenkins/commit/896356a03893c300361dd8a3acc3b83f926301b7 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-23 (Fri, 23 Nov 2018) Changed paths: M Jenkinsfile M core/src/main/java/hudson/Functions.java M core/src/main/java/hudson/PluginManager.java M core/src/main/java/hudson/ProxyConfiguration.java M core/src/main/java/hudson/util/ProcessTree.java A core/src/main/java/hudson/util/Retrier.java M core/src/main/resources/hudson/Messages.properties M core/src/main/resources/hudson/Messages_es.properties M core/src/main/resources/hudson/PluginManager/_table.js M core/src/main/resources/hudson/PluginManager/check.jelly M core/src/main/resources/hudson/PluginManager/index.jelly M core/src/main/resources/hudson/PluginManager/table.jelly A core/src/main/resources/hudson/scheduler/Messages_zh_CN.properties M core/src/main/resources/hudson/util/Messages.properties M core/src/main/resources/hudson/util/Messages_es.properties A core/src/test/java/hudson/util/RetrierTest.java M pom.xml M src/findbugs/findbugs-excludes.xml A test-jdk8/pom.xml A test-jdk8/src/test/java/jenkins/security/Security218BlackBoxTest.java A test-jdk8/src/test/java/jenkins/security/Security218CliTest.java A test-jdk8/src/test/java/jenkins/security/Security232Test.java A test-jdk8/src/test/java/jenkins/security/security218/Payload.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/Deserializer.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/ExecBlockingSecurityManager.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/GeneratePayload.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/Serializer.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/exploit/JRMPClassLoadingListener.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/exploit/JRMPClient.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/exploit/JRMPListener.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/exploit/JSF.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/exploit/JenkinsCLI.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/exploit/JenkinsListener.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/exploit/JenkinsReverse.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/exploit/RMIRegistryExploit.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsBeanutils1.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections1.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections2.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections3.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections4.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections5.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections6.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/DynamicDependencies.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/FileUpload1.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/Groovy1.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/JRMPClient.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/JRMPListener.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/JSON1.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/Jdk7u21.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/JsonLibSignedObject.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/Ldap.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/ObjectPayload.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/ReleaseableObjectPayload.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring1.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring2.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/annotation/Dependencies.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/annotation/PayloadTest.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/util/ClassFiles.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/util/Gadgets.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/util/JavaVersion.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/util/PayloadRunner.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/payloads/util/Reflections.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/secmgr/DelegateSecurityManager.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/secmgr/ExecCheckingSecurityManager.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/secmgr/ThreadLocalSecurityManager.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/util/ClassFiles.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/util/Gadgets.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/util/PayloadRunner.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/util/Reflections.java A test-jdk8/src/test/java/jenkins/security/security218/ysoserial/util/Serializables.java A test-pom/pom.xml M test/pom.xml A test/src/test/java/hudson/PluginManagerCheckUpdateCenterTest.java M test/src/test/java/hudson/console/ConsoleAnnotatorTest.java R test/src/test/java/jenkins/security/Security218BlackBoxTest.java R test/src/test/java/jenkins/security/Security218CliTest.java R test/src/test/java/jenkins/security/Security232Test.java R test/src/test/java/jenkins/security/security218/Payload.java R test/src/test/java/jenkins/security/security218/ysoserial/Deserializer.java R test/src/test/java/jenkins/security/security218/ysoserial/ExecBlockingSecurityManager.java R test/src/test/java/jenkins/security/security218/ysoserial/GeneratePayload.java R test/src/test/java/jenkins/security/security218/ysoserial/Serializer.java R test/src/test/java/jenkins/security/security218/ysoserial/exploit/JRMPClassLoadingListener.java R test/src/test/java/jenkins/security/security218/ysoserial/exploit/JRMPClient.java R test/src/test/java/jenkins/security/security218/ysoserial/exploit/JRMPListener.java R test/src/test/java/jenkins/security/security218/ysoserial/exploit/JSF.java R test/src/test/java/jenkins/security/security218/ysoserial/exploit/JenkinsCLI.java R test/src/test/java/jenkins/security/security218/ysoserial/exploit/JenkinsListener.java R test/src/test/java/jenkins/security/security218/ysoserial/exploit/JenkinsReverse.java R test/src/test/java/jenkins/security/security218/ysoserial/exploit/RMIRegistryExploit.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsBeanutils1.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections1.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections2.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections3.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections4.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections5.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/CommonsCollections6.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/DynamicDependencies.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/FileUpload1.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/Groovy1.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/JRMPClient.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/JRMPListener.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/JSON1.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/Jdk7u21.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/JsonLibSignedObject.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/Ldap.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/ObjectPayload.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/ReleaseableObjectPayload.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring1.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/Spring2.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/annotation/Dependencies.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/annotation/PayloadTest.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/util/ClassFiles.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/util/Gadgets.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/util/JavaVersion.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/util/PayloadRunner.java R test/src/test/java/jenkins/security/security218/ysoserial/payloads/util/Reflections.java R test/src/test/java/jenkins/security/security218/ysoserial/secmgr/DelegateSecurityManager.java R test/src/test/java/jenkins/security/security218/ysoserial/secmgr/ExecCheckingSecurityManager.java R test/src/test/java/jenkins/security/security218/ysoserial/secmgr/ThreadLocalSecurityManager.java R test/src/test/java/jenkins/security/security218/ysoserial/util/ClassFiles.java R test/src/test/java/jenkins/security/security218/ysoserial/util/Gadgets.java R test/src/test/java/jenkins/security/security218/ysoserial/util/PayloadRunner.java R test/src/test/java/jenkins/security/security218/ysoserial/util/Reflections.java R test/src/test/java/jenkins/security/security218/ysoserial/util/Serializables.java M war/src/main/webapp/scripts/hudson-behavior.js Log Message: ----------- Merge commit '8d429ff13b2013ff0b390d59f9c8a7674e6d24a1' into security-master Commit: dfa84afa431482552850900bbe9a4b88209986fe https://github.com/jenkinsci/jenkins/commit/dfa84afa431482552850900bbe9a4b88209986fe Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-23 (Fri, 23 Nov 2018) Changed paths: M core/src/main/java/hudson/model/User.java M core/src/main/java/hudson/model/UserIdMapper.java M core/src/main/java/jenkins/security/ApiTokenProperty.java M core/src/main/java/jenkins/security/apitoken/ApiTokenStats.java M core/src/test/java/jenkins/security/apitoken/ApiTokenStatsTest.java A test/src/test/java/jenkins/security/apitoken/ApiTokenStatsRestartTest.java Log Message: ----------- Merge branch 'security-stable-2.150' into security-master Commit: 9494748f93193f268c3e291e83ddff1ba9ef5123 https://github.com/jenkinsci/jenkins/commit/9494748f93193f268c3e291e83ddff1ba9ef5123 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-23 (Fri, 23 Nov 2018) Changed paths: M test-pom/pom.xml Log Message: ----------- Add missing dependency on cloudbees-folder in test This got lost in the upmerge due a bad merge after test was split up into multiple modules Commit: 0a1bcceddb75a43d2fc48ecce1ab5cb0634f6ff8 https://github.com/jenkinsci/jenkins/commit/0a1bcceddb75a43d2fc48ecce1ab5cb0634f6ff8 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-11-26 (Mon, 26 Nov 2018) Changed paths: M cli/pom.xml M core/src/main/java/hudson/PluginManager.java M core/src/main/java/hudson/PluginWrapper.java M core/src/main/java/hudson/cli/InstallPluginCommand.java M core/src/main/java/hudson/model/UpdateCenter.java M core/src/main/java/hudson/model/UpdateSite.java M core/src/main/java/hudson/slaves/JNLPLauncher.java M core/src/main/resources/hudson/PluginManager/_table.js M core/src/main/resources/hudson/PluginManager/table.jelly M core/src/main/resources/hudson/model/AbstractBuild/index_ru.properties M core/src/main/resources/hudson/model/AbstractBuild/tasks_ru.properties M core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly M core/src/test/java/hudson/util/RetrierTest.java M pom.xml Log Message: ----------- Merge commit 'd2a0cef28e62dd8acc68bf6a3fc201741dc16217' into security-master Commit: 89af477fdc2bac3485b56ba0f97ab771d9f58b0f https://github.com/jenkinsci/jenkins/commit/89af477fdc2bac3485b56ba0f97ab771d9f58b0f Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-12-03 (Mon, 03 Dec 2018) Changed paths: M core/src/main/resources/jenkins/security/stapler/default-whitelist.txt Log Message: ----------- Merge branch 'security-stable-2.138' into security-stable-2.150 Commit: ab33e65d6c8a61ae8c06ad24ebe94ede30868367 https://github.com/jenkinsci/jenkins/commit/ab33e65d6c8a61ae8c06ad24ebe94ede30868367 Author: Daniel Beck <daniel-b...@users.noreply.github.com> Date: 2018-12-03 (Mon, 03 Dec 2018) Changed paths: M core/src/main/resources/jenkins/security/stapler/default-whitelist.txt Log Message: ----------- Merge branch 'security-stable-2.150' into security-master Commit: eedb77b38ebf6dd6a0c3a290d438ae4c7df69d99 https://github.com/jenkinsci/jenkins/commit/eedb77b38ebf6dd6a0c3a290d438ae4c7df69d99 Author: Kohsuke Kawaguchi <k...@kohsuke.org> Date: 2018-12-03 (Mon, 03 Dec 2018) Changed paths: M cli/pom.xml M core/pom.xml M pom.xml M test-jdk8/pom.xml M test-pom/pom.xml M test/pom.xml M war/pom.xml Log Message: ----------- [maven-release-plugin] prepare release jenkins-2.154 Compare: https://github.com/jenkinsci/jenkins/compare/b7b580bda358^...eedb77b38ebf **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019. -- 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.