Merge branch 'master' into hetero-list-button

mawinter69 · Aug 10, 2023 · b4bdcf9 · b4bdcf9
2 parents e192e8d + 2b8faf9
commit b4bdcf9
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 88 deletions.
diff --git a/ath.sh b/ath.sh
@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5686.vc3a_26a_d441a_9
+export ATH_VERSION=5688.vb_f1ceb_4b_74c4
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -82,7 +82,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>32.1.1-jre</version>
+        <version>32.1.2-jre</version>
       </dependency>
       <dependency>
         <!-- Overriding Stapler’s 1.1.3 version to diagnose JENKINS-20618: -->

diff --git 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.
         <script src="${resURL}/jsbundles/pages/register.js" type="text/javascript" defer="true" />
       </head>
       <body class="app-sign-in-register">
-        <st:include it="${simpleDecorator}" page="simple-header.jelly" optional="true" />
+        <section class="app-sign-in-register__branding">
+          <div class="app-sign-in-register__branding__starburst"></div>
+          <img src="${imagesURL}/svgs/logo.svg" alt="${%logo}"/>
+        </section>
         <main id="main-panel" class="app-sign-in-register__content">
           <div class="app-sign-in-register__content-inner">
             <h1>${%Register}</h1>
 
+            <st:include it="${simpleDecorator}" page="simple-header.jelly" optional="true" />
+
             <template id="i18n" data-strength-strong="${%Strong}"
                                 data-strength-moderate="${%Moderate}"
                                 data-strength-weak="${%Weak}"

diff --git a/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header.jelly b/core/src/main/resources/jenkins/model/DefaultSimplePageDecorator/simple-header.jelly
@@ -22,9 +22,4 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core">
-  <section class="app-sign-in-register__branding">
-    <div class="app-sign-in-register__branding__starburst"></div>
-    <img src="${imagesURL}/svgs/logo.svg" alt="${%logo}"/>
-  </section>
-</j:jelly>
+<j:jelly xmlns:j="jelly:core" />
diff --git 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.
             <st:include it="${it.setupWizard}" page="authenticate-security-token"/>
           </j:when>
           <j:otherwise>
-            <st:include it="${simpleDecorator}" page="simple-header.jelly" optional="true" />
+            <section class="app-sign-in-register__branding">
+              <div class="app-sign-in-register__branding__starburst"></div>
+              <img src="${imagesURL}/svgs/logo.svg" alt="${%logo}"/>
+            </section>
             <main id="main-panel" class="app-sign-in-register__content">
               <div class="app-sign-in-register__content-inner">
                 <h1>Sign in to Jenkins</h1>
 
+                <st:include it="${simpleDecorator}" page="simple-header.jelly" optional="true" />
+
                 <form name="login" action="${it.securityRealm.authenticationGatewayUrl}"
                     method="post">
                   <j:if test="${error}">

diff --git a/core/src/site/site.xml b/core/src/site/site.xml
@@ -6,7 +6,7 @@
         </breadcrumbs>
         <head>
             <![CDATA[
-                <script src="https://cdn.jsdelivr.net/npm/lit@2.7.6/polyfill-support.js"></script>
+                <script src="https://cdn.jsdelivr.net/npm/lit@2.8.0/polyfill-support.js"></script>
                 <script src="https://cdn.jsdelivr.net/npm/@webcomponents/[email protected]/webcomponents-loader.js"></script>
                 <script data="jio" src="https://cdn.jsdelivr.net/npm/@jenkinsci/jenkins-io-components/+esm" type="module"></script>
                 <script data="jio" nomodule="" src="https://cdn.jsdelivr.net/npm/@jenkinsci/jenkins-io-components"></script>

diff --git a/docs/MAINTAINERS.adoc b/docs/MAINTAINERS.adoc
@@ -26,7 +26,7 @@ Remoting updates in the core are subject to the process though.
 === Communication channels
 
 * Mailing list: link:https://groups.google.com/d/forum/jenkinsci-dev[Jenkins Developer Mailing List]
-* Chat for runtime Jenkins release coordination: `#jenkins-release` on Libera IRC
+* Chat for runtime Jenkins release coordination takes place in link:https://matrix.to/#/#jenkins-release:matrix.org[#jenkins-release:matrix.org].
 ** All async communications should go to the developer mailing list
 
 === Roles

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.103</version>
+    <version>1.104</version>
     <relativePath />
   </parent>
 
@@ -73,7 +73,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.418</revision>
+    <revision>2.419</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <!-- configuration for patch tracker plugin  -->

diff --git a/test/pom.xml b/test/pom.xml
@@ -62,7 +62,7 @@ THE SOFTWARE.
         <!-- RequireUpperBoundDeps between checks-api, plugin-util-api, and font-awesome-api -->
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>commons-text-api</artifactId>
-        <version>1.10.0-36.vc008c8fcda_7b_</version>
+        <version>1.10.0-68.v0d0b_c439292b_</version>
       </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps between bootstrap5-api and echarts-api -->
@@ -95,13 +95,13 @@ THE SOFTWARE.
         <!-- RequireUpperBoundDeps via mailer and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>display-url-api</artifactId>
-        <version>2.3.7</version>
+        <version>2.3.8</version>
       </dependency>
       <dependency>
         <!-- requireUpperBoundDeps via matrix-project and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>script-security</artifactId>
-        <version>1251.vfe552ed55f8d</version>
+        <version>1264.vecf66020eb_7d</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -116,7 +116,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2044.v03c87927ff5c</version>
+      <version>2053.v0ea_6fc5d99b_f</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -179,7 +179,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>antisamy-markup-formatter</artifactId>
-      <version>159.v25b_c67cd35fb_</version>
+      <version>162.v0e6ec0fcfcf6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -203,7 +203,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>mailer</artifactId>
-      <version>457.v3f72cb_e015e5</version>
+      <version>463.vedf8358e006b_</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -215,7 +215,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-project</artifactId>
-      <version>789.v57a_725b_63c79</version>
+      <version>802.v8013b_40c7edc</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/war/package.json b/war/package.json
@@ -31,14 +31,14 @@
     "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": "9.0.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.7.6",
     "postcss": "8.4.27",
     "postcss-loader": "7.3.3",
-    "postcss-preset-env": "9.1.0",
+    "postcss-preset-env": "9.1.1",
     "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",
@@ -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",