From cef3ff7546fecc5d32804807424c83b7de3f7a61 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:17:19 +0200
Subject: [PATCH 01/20] Update dependency prettier to v3.0.1 (#8337)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
war/package.json | 2 +-
war/yarn.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/war/package.json b/war/package.json
index aba15befa802..fda240677937 100644
--- a/war/package.json
+++ b/war/package.json
@@ -38,7 +38,7 @@
"postcss-loader": "7.3.3",
"postcss-preset-env": "9.1.0",
"postcss-scss": "4.0.6",
- "prettier": "3.0.0",
+ "prettier": "3.0.1",
"sass": "1.64.2",
"sass-loader": "13.3.2",
"style-loader": "3.3.3",
diff --git a/war/yarn.lock b/war/yarn.lock
index 7a1c274b2691..86d3c27f48c6 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -4394,7 +4394,7 @@ __metadata:
postcss-loader: 7.3.3
postcss-preset-env: 9.1.0
postcss-scss: 4.0.6
- prettier: 3.0.0
+ prettier: 3.0.1
sass: 1.64.2
sass-loader: 13.3.2
sortablejs: 1.15.0
@@ -6117,12 +6117,12 @@ __metadata:
languageName: node
linkType: hard
-"prettier@npm:3.0.0":
- version: 3.0.0
- resolution: "prettier@npm:3.0.0"
+"prettier@npm:3.0.1":
+ version: 3.0.1
+ resolution: "prettier@npm:3.0.1"
bin:
prettier: bin/prettier.cjs
- checksum: 6a832876a1552dc58330d2467874e5a0b46b9ccbfc5d3531eb69d15684743e7f83dc9fbd202db6270446deba9c82b79d24383d09924c462b457136a759425e33
+ checksum: e1f3f16c7fe0495de3faa182597871f74927d787cce3c52095a66ff5d7eacc05173371d5f58bf12141a0a1b6bfe739a338531d6cf18b92c7256c1319f2c84e73
languageName: node
linkType: hard
From 76c0bd2ea9fc829001b7228a8dfece8fa73c0f60 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:17:59 +0200
Subject: [PATCH 02/20] Update dependency eslint-config-prettier to v8.10.0
(#8338)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
war/package.json | 2 +-
war/yarn.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/war/package.json b/war/package.json
index fda240677937..c8eee0113d32 100644
--- a/war/package.json
+++ b/war/package.json
@@ -31,7 +31,7 @@
"css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "5.0.1",
"eslint": "8.46.0",
- "eslint-config-prettier": "8.9.0",
+ "eslint-config-prettier": "8.10.0",
"handlebars-loader": "1.7.3",
"mini-css-extract-plugin": "2.7.6",
"postcss": "8.4.27",
diff --git a/war/yarn.lock b/war/yarn.lock
index 86d3c27f48c6..07b2df8c76aa 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3485,14 +3485,14 @@ __metadata:
languageName: node
linkType: hard
-"eslint-config-prettier@npm:8.9.0":
- version: 8.9.0
- resolution: "eslint-config-prettier@npm:8.9.0"
+"eslint-config-prettier@npm:8.10.0":
+ version: 8.10.0
+ resolution: "eslint-config-prettier@npm:8.10.0"
peerDependencies:
eslint: ">=7.0.0"
bin:
eslint-config-prettier: bin/cli.js
- checksum: a675d0dabd76b700ef2d062b5ec6a634e105a8e8c070f95281fd2ccb614527fac60b4c758132058c50f0521fd19313f1f5be45ce9ebf081f2e5f77ae6eb7d8db
+ checksum: 153266badd477e49b0759816246b2132f1dbdb6c7f313ca60a9af5822fd1071c2bc5684a3720d78b725452bbac04bb130878b2513aea5e72b1b792de5a69fec8
languageName: node
linkType: hard
@@ -4383,7 +4383,7 @@ __metadata:
css-loader: 6.8.1
css-minimizer-webpack-plugin: 5.0.1
eslint: 8.46.0
- eslint-config-prettier: 8.9.0
+ eslint-config-prettier: 8.10.0
handlebars: 4.7.7
handlebars-loader: 1.7.3
hotkeys-js: 3.12.0
From afc7e5eacc6c083d78848b9942c5731ce779ed62 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:18:31 +0200
Subject: [PATCH 03/20] Update dependency lit to v2.8.0 (#8336)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
core/src/site/site.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/site/site.xml b/core/src/site/site.xml
index ce8a20455a69..30eb94e3fe3a 100644
--- a/core/src/site/site.xml
+++ b/core/src/site/site.xml
@@ -6,7 +6,7 @@
+
From 7b4acd8e7d09c78bfa69fbfa364cda44feca3e05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:19:10 +0200
Subject: [PATCH 04/20] Bump org.jenkins-ci.plugins:antisamy-markup-formatter
from 159.v25b_c67cd35fb_ to 162.v0e6ec0fcfcf6 (#8330)
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 cc0e7ec9e3ca..672bb462f68d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -179,7 +179,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
antisamy-markup-formatter
- 159.v25b_c67cd35fb_
+ 162.v0e6ec0fcfcf6
test
From 5adaeab227f632049eca2cda4c1232db86b95f3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:19:23 +0200
Subject: [PATCH 05/20] Bump org.jenkins-ci.plugins:script-security from
1251.vfe552ed55f8d to 1264.vecf66020eb_7d (#8329)
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 672bb462f68d..1a7264d1ce2e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -101,7 +101,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
script-security
- 1251.vfe552ed55f8d
+ 1264.vecf66020eb_7d
From b6c0d0d6c31337d9d6bad8f21f3ae60d408c4375 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:19:31 +0200
Subject: [PATCH 06/20] Bump org.jenkins-ci.plugins:mailer from
457.v3f72cb_e015e5 to 463.vedf8358e006b_ (#8328)
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 1a7264d1ce2e..fd24568af0ad 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -203,7 +203,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
mailer
- 457.v3f72cb_e015e5
+ 463.vedf8358e006b_
test
From ab53bb756cef5c0672fb91e85aa49e986b1b19f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:19:49 +0200
Subject: [PATCH 07/20] Bump org.jenkins-ci.plugins:matrix-project from
789.v57a_725b_63c79 to 802.v8013b_40c7edc (#8327)
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 fd24568af0ad..ae178619a73a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -215,7 +215,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
matrix-project
- 789.v57a_725b_63c79
+ 802.v8013b_40c7edc
test
From b68f3d8ec82b00e04237c7b2db0469baa8875f2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 13:20:19 +0200
Subject: [PATCH 08/20] Bump com.google.guava:guava from 32.1.1-jre to
32.1.2-jre (#8318)
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 9f255a92df24..537d08f11a36 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -82,7 +82,7 @@ THE SOFTWARE.
com.google.guava
guava
- 32.1.1-jre
+ 32.1.2-jre
From 6c9f9a2bbff6500c9fd0d1809689d21a6992287c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Aug 2023 16:30:47 +0200
Subject: [PATCH 09/20] Update dependency handlebars to v4.7.8 (#8334)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
war/package.json | 2 +-
war/yarn.lock | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/war/package.json b/war/package.json
index c8eee0113d32..ad68c152994e 100644
--- a/war/package.json
+++ b/war/package.json
@@ -50,7 +50,7 @@
"webpack-remove-empty-scripts": "1.0.3"
},
"dependencies": {
- "handlebars": "4.7.7",
+ "handlebars": "4.7.8",
"hotkeys-js": "3.12.0",
"jquery": "3.7.0",
"lodash": "4.17.21",
diff --git a/war/yarn.lock b/war/yarn.lock
index 07b2df8c76aa..e1f677e327de 100644
--- a/war/yarn.lock
+++ b/war/yarn.lock
@@ -3998,12 +3998,12 @@ __metadata:
languageName: node
linkType: hard
-"handlebars@npm:4.7.7":
- version: 4.7.7
- resolution: "handlebars@npm:4.7.7"
+"handlebars@npm:4.7.8":
+ version: 4.7.8
+ resolution: "handlebars@npm:4.7.8"
dependencies:
minimist: ^1.2.5
- neo-async: ^2.6.0
+ neo-async: ^2.6.2
source-map: ^0.6.1
uglify-js: ^3.1.4
wordwrap: ^1.0.0
@@ -4012,7 +4012,7 @@ __metadata:
optional: true
bin:
handlebars: bin/handlebars
- checksum: 1e79a43f5e18d15742977cb987923eab3e2a8f44f2d9d340982bcb69e1735ed049226e534d7c1074eaddaf37e4fb4f471a8adb71cddd5bc8cf3f894241df5cee
+ checksum: 00e68bb5c183fd7b8b63322e6234b5ac8fbb960d712cb3f25587d559c2951d9642df83c04a1172c918c41bcfc81bfbd7a7718bbce93b893e0135fc99edea93ff
languageName: node
linkType: hard
@@ -4384,7 +4384,7 @@ __metadata:
css-minimizer-webpack-plugin: 5.0.1
eslint: 8.46.0
eslint-config-prettier: 8.10.0
- handlebars: 4.7.7
+ handlebars: 4.7.8
handlebars-loader: 1.7.3
hotkeys-js: 3.12.0
jquery: 3.7.0
@@ -5008,7 +5008,7 @@ __metadata:
languageName: node
linkType: hard
-"neo-async@npm:^2.6.0, neo-async@npm:^2.6.2":
+"neo-async@npm:^2.6.2":
version: 2.6.2
resolution: "neo-async@npm:2.6.2"
checksum: deac9f8d00eda7b2e5cd1b2549e26e10a0faa70adaa6fdadca701cc55f49ee9018e427f424bac0c790b7c7e2d3068db97f3093f1093975f2acb8f8818b936ed9
From 16311122e7f8d0d87cc2df763cd5e2605d49fac5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Aug 2023 09:47:30 -0700
Subject: [PATCH 10/20] Bump org.jenkins-ci.plugins:display-url-api from 2.3.7
to 2.3.8 (#8343)
Signed-off-by: dependabot[bot]
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 ae178619a73a..48c08d4e2de0 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -95,7 +95,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
display-url-api
- 2.3.7
+ 2.3.8
From 8af4d4c2172d4d721bbb89a1db83d552b3f9d99a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Aug 2023 09:47:35 -0700
Subject: [PATCH 11/20] Bump io.jenkins.plugins:commons-text-api from
1.10.0-36.vc008c8fcda_7b_ to 1.10.0-68.v0d0b_c439292b_ (#8342)
Signed-off-by: dependabot[bot]
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 48c08d4e2de0..4074767623ee 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -62,7 +62,7 @@ THE SOFTWARE.
io.jenkins.plugins
commons-text-api
- 1.10.0-36.vc008c8fcda_7b_
+ 1.10.0-68.v0d0b_c439292b_
From ce7f89712d4f55afdb2b9032ed98617e0fde9df5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Aug 2023 21:40:44 -0700
Subject: [PATCH 12/20] Bump org.jenkins-ci:jenkins from 1.103 to 1.104 (#8346)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9621fa87e3ce..c64d580312ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci
jenkins
- 1.103
+ 1.104
From 4ccb66b0f8c0ba7fed28e7cccf8903b0f4e58dae Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Tue, 8 Aug 2023 13:06:42 +0100
Subject: [PATCH 13/20] [JENKINS-71238] New login page breaks
`login-theme-plugin` (#8341)
Move simple-header out
---
.../security/HudsonPrivateSecurityRealm/signup.jelly | 7 ++++++-
.../model/DefaultSimplePageDecorator/simple-header.jelly | 7 +------
core/src/main/resources/jenkins/model/Jenkins/login.jelly | 7 ++++++-
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
index 45339b4d3d7a..1e550e3a1497 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
@@ -52,11 +52,16 @@ THE SOFTWARE.
-
+
+
+
+
${%Register}
+
+
-
-
-
-
-
-
+
diff --git a/core/src/main/resources/jenkins/model/Jenkins/login.jelly b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
index f0bfa4c71e53..1ad3fd1d5f15 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/login.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
@@ -67,11 +67,16 @@ THE SOFTWARE.
-
+
+
+
+