From 816c6b99cf78bc2c4251456de21c0a3354daa1a6 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue, 23 Aug 2022 08:06:33 +0100 Subject: [PATCH 1/8] Change icon for 'People' task on user profiles (#7006) --- core/src/main/resources/hudson/model/User/sidepanel.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/model/User/sidepanel.jelly b/core/src/main/resources/hudson/model/User/sidepanel.jelly index b321765cf1ab7..c92a0f5f228c5 100644 --- a/core/src/main/resources/hudson/model/User/sidepanel.jelly +++ b/core/src/main/resources/hudson/model/User/sidepanel.jelly @@ -31,7 +31,7 @@ THE SOFTWARE. - + From bd665d7cf995d3563566312b2d929d56f57e511d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 08:06:46 +0100 Subject: [PATCH 2/8] Bump jenkins-test-harness from 1832.v0a_c4a_fc6c2c8 to 1834.v91a_a_5f4b_6529 (#7022) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pom.xml b/test/pom.xml index 2defa12b8adee..37e038d6526ba 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -90,7 +90,7 @@ THE SOFTWARE. ${project.groupId} jenkins-test-harness - 1832.v0a_c4a_fc6c2c8 + 1834.v91a_a_5f4b_6529 test From 6dea22de72743d882ffb925b043c9c79968fb286 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Tue, 23 Aug 2022 09:06:54 +0200 Subject: [PATCH 3/8] chore: Exclude bootstrap from renovate (#7024) --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/renovate.json b/renovate.json index aed40e96353f8..f1c192ec55ee6 100644 --- a/renovate.json +++ b/renovate.json @@ -16,6 +16,12 @@ "stabilityDays": 3, "reviewers": ["team:sig-ux"] }, + { + "matchPackageNames": ["bootstrap"], + "allowedVersions": "<=3.4.1", + "description": "https://issues.jenkins.io/browse/JENKINS-69409", + "enabled": false + }, { "matchPackageNames": ["node"], "allowedVersions": "/16.[0-9]+.[0-9]+(.[0-9]+)?$/" From c6c74ccf5ba4ffe43feaabadb8552d40bee8a119 Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 23 Aug 2022 13:12:02 +0000 Subject: [PATCH 4/8] [maven-release-plugin] prepare release jenkins-2.365 --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 4 ++-- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty10/pom.xml | 2 +- websocket/jetty9/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 6ba0c72533fdb..24a86fcc0eebc 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 5dffa8557e9a8..bdd042f42a38d 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 cli diff --git a/core/pom.xml b/core/pom.xml index 0a3d33b238103..f549ceb34bb7f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index 9f27c8d11cf0c..667dd3435fbdf 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 jenkins-coverage diff --git a/pom.xml b/pom.xml index 8ff0670edddd9..856331c080a39 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 pom Jenkins main module @@ -64,7 +64,7 @@ THE SOFTWARE. scm:git:https://github.com/jenkinsci/jenkins.git scm:git:git@github.com:jenkinsci/jenkins.git - ${scmTag} + jenkins-2.365 https://github.com/jenkinsci/jenkins diff --git a/test/pom.xml b/test/pom.xml index 37e038d6526ba..2bd36e6e2a380 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 jenkins-test diff --git a/war/pom.xml b/war/pom.xml index 2a69af3708da9..9a13aa09c9d66 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 jenkins-war diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml index c880f1d11614c..7ee376fd28df0 100644 --- a/websocket/jetty10/pom.xml +++ b/websocket/jetty10/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 ../.. diff --git a/websocket/jetty9/pom.xml b/websocket/jetty9/pom.xml index da8953f10b668..9e8e5cc24671b 100644 --- a/websocket/jetty9/pom.xml +++ b/websocket/jetty9/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 90ec18754ae93..ede7174e6fd79 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.365 ../.. From 389e7c21fa2760d7a5b2bc229872ae029e387d6c Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 23 Aug 2022 13:12:28 +0000 Subject: [PATCH 5/8] [maven-release-plugin] prepare for next development iteration --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 6 +++--- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty10/pom.xml | 2 +- websocket/jetty9/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 24a86fcc0eebc..6ba0c72533fdb 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index bdd042f42a38d..5dffa8557e9a8 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} cli diff --git a/core/pom.xml b/core/pom.xml index f549ceb34bb7f..0a3d33b238103 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index 667dd3435fbdf..9f27c8d11cf0c 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} jenkins-coverage diff --git a/pom.xml b/pom.xml index 856331c080a39..21d6777764496 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} pom Jenkins main module @@ -64,7 +64,7 @@ THE SOFTWARE. scm:git:https://github.com/jenkinsci/jenkins.git scm:git:git@github.com:jenkinsci/jenkins.git - jenkins-2.365 + ${scmTag} https://github.com/jenkinsci/jenkins @@ -74,7 +74,7 @@ THE SOFTWARE. - 2.365 + 2.366 -SNAPSHOT diff --git a/test/pom.xml b/test/pom.xml index 2bd36e6e2a380..37e038d6526ba 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} jenkins-test diff --git a/war/pom.xml b/war/pom.xml index 9a13aa09c9d66..2a69af3708da9 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} jenkins-war diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml index 7ee376fd28df0..c880f1d11614c 100644 --- a/websocket/jetty10/pom.xml +++ b/websocket/jetty10/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} ../.. diff --git a/websocket/jetty9/pom.xml b/websocket/jetty9/pom.xml index 9e8e5cc24671b..da8953f10b668 100644 --- a/websocket/jetty9/pom.xml +++ b/websocket/jetty9/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index ede7174e6fd79..90ec18754ae93 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.365 + ${revision}${changelist} ../.. From dd8f8c435caef892b30becf3e36e8ddfe37f37e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 07:54:37 -0700 Subject: [PATCH 6/8] Upgrade SLF4J from from 1.7.36 to 2.0.0 (#7021) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 6ba0c72533fdb..a8836ad53ae72 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ THE SOFTWARE. 9.3 - 1.7.36 + 2.0.0 1730.v43d2c7b_11a_27 2.4.21 From a7d4cd3a734ae9879569c274f0a087b7e530ece1 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 23 Aug 2022 07:54:53 -0700 Subject: [PATCH 7/8] Remove `junit-bom` from managed dependencies (#7023) --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 21d6777764496..e54e5f876d930 100644 --- a/pom.xml +++ b/pom.xml @@ -104,13 +104,6 @@ THE SOFTWARE. - - org.junit - junit-bom - 5.9.0 - pom - import - From 57797579c6932b5feecc25fedef6aa0be60cd99a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 07:55:36 -0700 Subject: [PATCH 8/8] Update dependency @babel/core to v7.18.13 (#7025) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 64 +++++++++++++++++++++++++++++++----------------- 2 files changed, 43 insertions(+), 23 deletions(-) diff --git a/war/package.json b/war/package.json index f05354e1a3d4a..85a4c9b182cce 100644 --- a/war/package.json +++ b/war/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@babel/cli": "7.18.10", - "@babel/core": "7.18.10", + "@babel/core": "7.18.13", "autoprefixer": "10.4.8", "clean-webpack-plugin": "4.0.0", "copy-webpack-plugin": "11.0.0", diff --git a/war/yarn.lock b/war/yarn.lock index f7f39d691a2a1..aa234270bde20 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -58,37 +58,37 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.18.10": - version: 7.18.10 - resolution: "@babel/core@npm:7.18.10" +"@babel/core@npm:7.18.13": + version: 7.18.13 + resolution: "@babel/core@npm:7.18.13" dependencies: "@ampproject/remapping": ^2.1.0 "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.18.10 + "@babel/generator": ^7.18.13 "@babel/helper-compilation-targets": ^7.18.9 "@babel/helper-module-transforms": ^7.18.9 "@babel/helpers": ^7.18.9 - "@babel/parser": ^7.18.10 + "@babel/parser": ^7.18.13 "@babel/template": ^7.18.10 - "@babel/traverse": ^7.18.10 - "@babel/types": ^7.18.10 + "@babel/traverse": ^7.18.13 + "@babel/types": ^7.18.13 convert-source-map: ^1.7.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.1 semver: ^6.3.0 - checksum: 3a3fcd878430a9e1cb165f755c89fff45acc4efe4dd3a2ba356e89af331cb1947886b9782d56902a49af19ba3c24f08cf638a632699b9c5a4d8305c57c6a150d + checksum: c7ee5b2c10bc5b0325e31fb5da4cb4bc03f9d5f5c00ec3481a018917bcc6b7b040de0690c606a424f57e5fc26d218d64e7718d0e5d7d8614d39c8cd898fab9b3 languageName: node linkType: hard -"@babel/generator@npm:^7.18.10": - version: 7.18.12 - resolution: "@babel/generator@npm:7.18.12" +"@babel/generator@npm:^7.18.13": + version: 7.18.13 + resolution: "@babel/generator@npm:7.18.13" dependencies: - "@babel/types": ^7.18.10 + "@babel/types": ^7.18.13 "@jridgewell/gen-mapping": ^0.3.2 jsesc: ^2.5.1 - checksum: 07dd71d255144bb703a80ab0156c35d64172ce81ddfb70ff24e2be687b052080233840c9a28d92fa2c33f7ecb8a8b30aef03b807518afc53b74c7908bf8859b1 + checksum: 27f5e7eb774e4d76ee75dc96e3e1bd26cc0ee7cea13a8f7342b716319c0a4d4e26fc49aa8f19316f7c99383da55eeb2a866c6e034e9deacad58a9de9ed6004fb languageName: node linkType: hard @@ -375,7 +375,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.11": +"@babel/parser@npm:^7.18.10": version: 7.18.11 resolution: "@babel/parser@npm:7.18.11" bin: @@ -384,6 +384,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.18.13": + version: 7.18.13 + resolution: "@babel/parser@npm:7.18.13" + bin: + parser: ./bin/babel-parser.js + checksum: 8b41c35607668495d67d9a7c5f61768aaab26acf887efdadc2781aed54046981480ef40aeda0b84d61aed02cf0c4ff4b028d5f83ab85e17e2ddff318f9243b8b + languageName: node + linkType: hard + "@babel/parser@npm:^7.18.6, @babel/parser@npm:^7.18.9": version: 7.18.9 resolution: "@babel/parser@npm:7.18.9" @@ -1282,21 +1291,21 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.18.10": - version: 7.18.11 - resolution: "@babel/traverse@npm:7.18.11" +"@babel/traverse@npm:^7.18.13": + version: 7.18.13 + resolution: "@babel/traverse@npm:7.18.13" dependencies: "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.18.10 + "@babel/generator": ^7.18.13 "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.18.9 "@babel/helper-hoist-variables": ^7.18.6 "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.18.11 - "@babel/types": ^7.18.10 + "@babel/parser": ^7.18.13 + "@babel/types": ^7.18.13 debug: ^4.1.0 globals: ^11.1.0 - checksum: 727409464d5cf27f33555010098ce9bb435f0648cc76e674f4fb7513522356655ba62be99c8df330982b391ccf5f0c0c23c7bd7453d4936d47e2181693fed14c + checksum: 1a2ef738fac4968feba6385787a3f8f7357d08e7739ecc5b37d8ff5668935253a03290f700f02a85ccfd369d5898625f0722d7733bff2ef91504f6cd8b836f19 languageName: node linkType: hard @@ -1329,6 +1338,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.18.13": + version: 7.18.13 + resolution: "@babel/types@npm:7.18.13" + dependencies: + "@babel/helper-string-parser": ^7.18.10 + "@babel/helper-validator-identifier": ^7.18.6 + to-fast-properties: ^2.0.0 + checksum: abc3ad1f3b6864df0ea0e778bcdf7d2c5ee2293811192962d50e8a8c05c1aeec90a48275f53b2a45aad882ed8bef9477ae1f8e70ac1d44d039e14930d1388dcc + languageName: node + linkType: hard + "@babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.18.9 resolution: "@babel/types@npm:7.18.9" @@ -3997,7 +4017,7 @@ __metadata: resolution: "jenkins-ui@workspace:." dependencies: "@babel/cli": 7.18.10 - "@babel/core": 7.18.10 + "@babel/core": 7.18.13 "@babel/preset-env": 7.18.10 autoprefixer: 10.4.8 babel-loader: 8.2.5