Merge branch 'master' into JENKINS-72988

core/src/main/java/hudson/security/ACL.java

@@ -237,7 +237,7 @@ public final void checkCreatePermission(@NonNull ItemGroup c,
         }
         if (!hasCreatePermission2(a, c, d)) {
             throw new AccessDeniedException(Messages.AccessDeniedException2_MissingPermission(a.getName(),
-                    Item.CREATE.group.title + "/" + Item.CREATE.name + Item.CREATE + "/" + d.getDisplayName()));
+                    Item.CREATE.group.title + "/" + Item.CREATE.name + "/" + d.getDisplayName()));
         }
     }
     /**
@@ -290,7 +290,7 @@ public final void checkCreatePermission(@NonNull ViewGroup c,
         }
         if (!hasCreatePermission2(a, c, d)) {
             throw new AccessDeniedException(Messages.AccessDeniedException2_MissingPermission(a.getName(),
-                    View.CREATE.group.title + "/" + View.CREATE.name + View.CREATE + "/" + d.getDisplayName()));
+                    View.CREATE.group.title + "/" + View.CREATE.name + "/" + d.getDisplayName()));
         }
     }
 

core/src/main/resources/hudson/widgets/HistoryWidget/index.jelly

@@ -56,7 +56,7 @@ THE SOFTWARE.
         <div id="jenkins-build-history" class="app-builds-container__items">
         </div>
 
-        <div class="app-builds-container__controls" id="controls">
+        <div class="app-builds-container__controls jenkins-hidden" id="controls">
           <button class="jenkins-button jenkins-button--tertiary jenkins-card__unveil" id="up">
             <l:icon src="symbol-arrow-left" />
             <span class="jenkins-visually-hidden">${%Newer builds}</span>

core/src/main/resources/jenkins/install/pluginSetupWizard.properties

@@ -66,7 +66,7 @@ installWizard_installIncomplete_message=Jenkins was restarted during installatio
 installWizard_installIncomplete_resumeInstallationButtonLabel=Resume
 installWizard_saveFirstUser=Save and Continue
 installWizard_skipFirstUser=Skip and continue as admin
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 You have skipped the <strong>setup of an admin user</strong>. <br /><br />\
 To log in, use the username: "admin" and the administrator password you used to access the setup wizard.\
 </div>
@@ -76,7 +76,7 @@ installWizard_addFirstUser_title=Getting Started
 installWizard_configureInstance_title=Instance Configuration
 installWizard_saveConfigureInstance=Save and Finish
 installWizard_skipConfigureInstance=Not now
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 You have skipped the configuration of the Jenkins URL. <br/><br/>\
 To configure the Jenkins URL, go to "Manage Jenkins" page.\
 </div>

core/src/main/resources/jenkins/install/pluginSetupWizard_fr.properties

@@ -41,15 +41,15 @@ certains plugins n\'ont pas l\'air d\'avoir été installés.
 installWizard_installIncomplete_resumeInstallationButtonLabel=Reprendre
 installWizard_saveFirstUser=Sauver et continuer
 installWizard_skipFirstUser=Continuer en tant qu\'Administrateur
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Vous avez passé la <strong>création d\'un utilisateur administrateur</strong>. <br /><br />\
 Pour vous connecter, utilisez le login : "admin" et le mot de passe administrateur que vous avez utilisé pour accéder au \
 wizard d\'installation.</div>
 installWizard_addFirstUser_title=Démarrage
 
 # instance configuration page
 installWizard_configureInstance_title=Démarrage
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Vous avez passé la <strong>configuration de l\'instance</strong>. <br /><br /> \
 Vous pouvez toujours vous rendre sur les pages de configuration pour remplir les informations qui pourraient manquer.\
 </div>

core/src/main/resources/jenkins/install/pluginSetupWizard_it.properties

@@ -23,7 +23,7 @@
 
 installWizard_addFirstUser_title=Attività iniziali
 installWizard_configureInstanceSkippedMessage=\
-  <div class="jenkins-alert jenkins-alert-warning fade in">La configurazione dell''URL di \
+  <div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">La configurazione dell''URL di \
   Jenkins è stata omessa.<br/><br/>Per configurare l''URL di Jenkins, aprire \
   la pagina "Gestisci Jenkins".</div>
 installWizard_configureInstance_title=Configurazione istanza
@@ -37,7 +37,7 @@ installWizard_error_restartNotSupported=Il riavvio non è supportato, \
   riavviare quest''istanza manualmente
 installWizard_error_title=Errore
 installWizard_firstUserSkippedMessage=\
-  <div class="jenkins-alert jenkins-alert-warning fade in">La <strong>configurazione di un \
+  <div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">La <strong>configurazione di un \
   utente amministratore</strong> è stata omessa.<br /><br />Per accedere, \
   utilizzare il nome utente "admin" e la password di amministrazione che si \
   è utilizzata per accedere alla configurazione guidata.</div>

core/src/main/resources/jenkins/install/pluginSetupWizard_lt.properties

@@ -39,7 +39,7 @@ installWizard_installIncomplete_message=Jenkinsas buvo iš naujo paleistas diegi
 installWizard_installIncomplete_resumeInstallationButtonLabel=Tęsti
 installWizard_saveFirstUser=Įrašyti ir baigti
 installWizard_skipFirstUser=Tęsti kaip administratoriumi
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Jūs praleidote administratoriaus naudotojo kūrimą. Norėdami prisijungti, naudokite vardą: „admin“ ir \
 administratoriaus slaptažodį, kurį naudojote prisijungimui prie nustatymo vedlio.\
 </div>

core/src/main/resources/jenkins/install/pluginSetupWizard_pl.properties

@@ -31,7 +31,7 @@ installWizard_jenkinsVersionTitle=Jenkins
 installWizard_installComplete_banner=Jenkins jest gotowy!
 installWizard_installComplete_finishButtonLabel=Zacznij korzystać z Jenkinsa
 installWizard_installComplete_message=Konfiguracja Jenkinsa została zakończona.
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Pominięto utworzenie konta administratora. Aby się zalogować, użyj loginu 'admin' i hasła użytego podczas konfigurowania Jenkinsa.\
 </div>
 installWizard_addFirstUser_title=Dodawanie pierwszego użytkownika
@@ -79,7 +79,7 @@ installWizard_installComplete_installComplete_restartRequiredNotSupportedMessage
 installWizard_gettingStarted_title=Zaczynamy
 installWizard_saveSecurity=Zapisz i kontynuuj
 installWizard_installIncomplete_dependenciesLabel=Zależności
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Pominięto konfiguracje bazowego adresu URL Jenkinsa. <br/><br/>\
 Aby go skonfigurować, przejdź do strony "Zarządzaj Jenkinsem".\
 </div>

core/src/main/resources/jenkins/install/pluginSetupWizard_pt_BR.properties

@@ -38,7 +38,7 @@ installWizard_error_connection=Incapaz de conectar ao Jenkins
 installWizard_installing_detailsLink=Detalhes...
 installWizard_gettingStarted_title=Começando
 installWizard_installIncomplete_title=Prosseguir com a instalação
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">Você pulou a configuração da \
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">Você pulou a configuração da \
   URL do Jenkins. <br/><br/>Para configurá-la, vá para a página "Gerenciar o Jenkins".</div>
 installWizard_installIncomplete_banner=Prosseguir com a instalação
 installWizard_welcomePanel_recommendedActionTitle=Instalar as extensões sugeridas
@@ -82,7 +82,7 @@ installWizard_installComplete_finishButtonLabel=Começar a usar o Jenkins
 installWizard_goInstall=Instalar
 installWizard_installCustom_selectNone=Nenhum
 installWizard_installComplete_title=Começar
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">Você pulou a <strong>configuração do \
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">Você pulou a <strong>configuração do \
   usuário admin</strong>. <br /><br />Para entrar, use o nome de usuário "admin" e a senha de administrador que você \
   usou para acessar o assistente de configuração.</div>
 installWizard_configureProxy_save=Salvar e continuar

core/src/main/resources/jenkins/install/pluginSetupWizard_sr.properties

@@ -40,7 +40,7 @@ installWizard_installIncomplete_banner=Настави са инсталациј
 installWizard_installIncomplete_message=
 installWizard_saveFirstUser=Сачувај и настави
 installWizard_skipFirstUser=Настави са администраторским налогом
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Прескочили сте креирањем административог корисника. Пријавите се како што ће те користити име: 'admin' и лозинку коју сте користили инсталацијом.\
 </div>
 installWizard_addFirstUser_title=Почетак

core/src/main/resources/jenkins/install/pluginSetupWizard_sv_SE.properties

@@ -66,7 +66,7 @@ installWizard_installIncomplete_message=Jenkins startades om under installatione
 installWizard_installIncomplete_resumeInstallationButtonLabel=Återuppta
 installWizard_saveFirstUser=Spara och fortsätt
 installWizard_skipFirstUser=Hoppa över och fortsätt som administratör
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Du har hoppat över <strong>installationen av en administratörsanvändare</strong>. <br /><br />\
 Använd användarnamnet "admin" och administratörslösenordet du använde för att komma åt installationsguiden för att logga in.\
 </div>
@@ -76,7 +76,7 @@ installWizard_addFirstUser_title=Kom igång
 installWizard_configureInstance_title=Konfigurera instans
 installWizard_saveConfigureInstance=Spara och avsluta
 installWizard_skipConfigureInstance=Inte nu
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 Du har hoppat över konfigurationen av Jenkins-webbadressen. <br/><br/>\
 Gå till sidan "Hantera Jenkins" för att konfigurera Jenkins-webbadressen.\
 </div>

core/src/main/resources/jenkins/install/pluginSetupWizard_zh_CN.properties

@@ -64,7 +64,7 @@ installWizard_installIncomplete_message=Jenkins在安装过程已重启，部分
 installWizard_installIncomplete_resumeInstallationButtonLabel=恢复
 installWizard_saveFirstUser=保存并完成
 installWizard_skipFirstUser=使用admin账户继续
-installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_firstUserSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 你已跳过创建admin用户的步骤。要登录请使用用户名：'admin' \
 及用于访问安装向导的管理员密码。\
 </div> 
@@ -74,7 +74,7 @@ installWizard_addFirstUser_title=新手入门
 installWizard_configureInstance_title=实例配置
 installWizard_saveConfigureInstance=保存并完成
 installWizard_skipConfigureInstance=现在不要
-installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning fade in">\
+installWizard_configureInstanceSkippedMessage=<div class="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">\
 您已经跳过了 Jenkins URL的配置。 <br/><br/>\
 要配置 Jenkins URL的话，到“Jenkins管理”页面。\
 </div>

core/src/main/resources/jenkins/install/pluginSetupWizard_zh_TW.properties

@@ -61,14 +61,14 @@ installWizard_installIncomplete_message=Jenkins 在安裝期間重新啟動，
 installWizard_installIncomplete_resumeInstallationButtonLabel=繼續
 installWizard_saveFirstUser=儲存並繼續
 installWizard_skipFirstUser=跳過並以 admin 繼續
-installWizard_firstUserSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning fade in">您已略過<strong>設定管理員使用者</strong>。<br /><br />請使用帳號：「admin」和您進入安裝精靈的管理員密碼登入。</div>
+installWizard_firstUserSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">您已略過<strong>設定管理員使用者</strong>。<br /><br />請使用帳號：「admin」和您進入安裝精靈的管理員密碼登入。</div>
 installWizard_addFirstUser_title=開始使用
 
 # instance configuration page
 installWizard_configureInstance_title=執行個體組態
 installWizard_saveConfigureInstance=儲存並完成
 installWizard_skipConfigureInstance=暫時不要
-installWizard_configureInstanceSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning fade in">您已略過設定 Jenkins URL。<br/><br/>您之後可以到「管理 Jenkins」頁面設定 Jenkins URL。</div>
+installWizard_configureInstanceSkippedMessage=<div class\="jenkins-alert jenkins-alert-warning jenkins-!-margin-top-1 jenkins-!-margin-bottom-0 fade in">您已略過設定 Jenkins URL。<br/><br/>您之後可以到「管理 Jenkins」頁面設定 Jenkins URL。</div>
 
 installWizard_configureProxy_label=設定代理伺服器
 installWizard_configureProxy_save=儲存並繼續

core/src/test/java/jenkins/util/io/PathRemoverTest.java

@@ -69,7 +69,7 @@
 public class PathRemoverTest {
 
     @Rule public TemporaryFolder tmp = new TemporaryFolder();
-    @Rule public Timeout timeout = new Timeout(10, TimeUnit.SECONDS);
+    @Rule public Timeout timeout = new Timeout(30, TimeUnit.SECONDS);
     @Rule public FileLockerRule locker = new FileLockerRule();
 
     @Test

pom.xml

@@ -74,9 +74,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.474</revision>
+    <revision>2.475</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-08-20T13:40:21Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-08-27T13:51:01Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
@@ -282,7 +282,7 @@ THE SOFTWARE.
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>10.17.0</version>
+              <version>10.18.0</version>
             </dependency>
           </dependencies>
           <executions>

war/package.json

@@ -25,13 +25,13 @@
   "devDependencies": {
     "@babel/cli": "7.24.8",
     "@babel/core": "7.25.2",
-    "@babel/preset-env": "7.25.3",
-    "@eslint/js": "9.9.0",
+    "@babel/preset-env": "7.25.4",
+    "@eslint/js": "9.9.1",
     "babel-loader": "9.1.3",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.9.0",
+    "eslint": "9.9.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.9.0",
@@ -48,7 +48,7 @@
     "stylelint": "16.8.2",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.1",
-    "webpack": "5.93.0",
+    "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
     "webpack-remove-empty-scripts": "1.0.4"
   },

war/pom.xml

@@ -49,7 +49,7 @@ THE SOFTWARE.
     <mina-sshd-api.version>2.13.2-125.v200281b_61d59</mina-sshd-api.version>
     <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
     <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
-    <node.version>20.16.0</node.version>
+    <node.version>20.17.0</node.version>
     <!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
     <yarn.version>1.22.19</yarn.version>
     <!-- maven-antrun-plugin will download this Yarn version. -->

war/src/main/js/pages/project/builds-card.js

@@ -26,13 +26,28 @@ const updateBuildsRefreshInterval = 5000;
  */
 function load(options = {}) {
   /** @type {QueryParameters} */
+  cancelRefreshTimeout();
   const params = Object.assign({}, options, { search: pageSearchInput.value });
+  const paginationOrFirst =
+    buildHistoryPage.dataset.pageHasUp === "false" ||
+    "older-than" in params ||
+    "newer-than" in params;
 
-  // Avoid fetching if the page isn't active
+  // Avoid fetching if the page isn't visible
   if (document.hidden) {
     return;
   }
 
+  createRefreshTimeout();
+
+  // When we're not on the first page and this is not a load due to pagination
+  // we need to set the correct value for older-than so we fetch the same set of runs
+  if (!paginationOrFirst) {
+    params["older-than"] = (
+      BigInt(buildHistoryPage.dataset.pageEntryNewest) + 1n
+    ).toString();
+  }
+
   fetch(ajaxUrl + toQueryString(params)).then((rsp) => {
     if (rsp.ok) {
       rsp.text().then((responseText) => {
@@ -92,23 +107,16 @@ function updateCardControls(parameters) {
     !parameters.pageHasDown,
   );
 
-  // We only want the list to refresh if the user is on the first page of results
-  if (!parameters.pageHasUp) {
-    createRefreshTimeout();
-  } else {
-    cancelRefreshTimeout();
-  }
-
   buildHistoryPage.dataset.pageEntryNewest = parameters.pageEntryNewest;
   buildHistoryPage.dataset.pageEntryOldest = parameters.pageEntryOldest;
+  buildHistoryPage.dataset.pageHasUp = parameters.pageHasUp;
 }
 
 paginationPrevious.addEventListener("click", () => {
   load({ "newer-than": buildHistoryPage.dataset.pageEntryNewest });
 });
 
 paginationNext.addEventListener("click", () => {
-  cancelRefreshTimeout();
   load({ "older-than": buildHistoryPage.dataset.pageEntryOldest });
 });
 
@@ -139,4 +147,8 @@ document.addEventListener("DOMContentLoaded", function () {
   });
 
   load();
+
+  window.addEventListener("focus", function () {
+    load();
+  });
 });

war/src/main/scss/abstracts/_theme.scss

@@ -200,15 +200,13 @@ $semantics: (
   --link-font-weight: 450;
 
   // Tooltips
-  --tooltip-backdrop-filter: contrast(0.6) brightness(2.4) saturate(2)
-    blur(15px);
+  --tooltip-backdrop-filter: saturate(2) blur(20px);
   --tooltip-color: var(--text-color);
   --tooltip-box-shadow: 0 0 8px 2px rgba(0, 0, 30, 0.05),
     0 0 1px 1px rgba(0, 0, 20, 0.025), 0 10px 20px rgba(0, 0, 20, 0.15);
 
   // Dropdowns
-  --dropdown-backdrop-filter: contrast(0.6) brightness(2.5) saturate(1.5)
-    blur(20px);
+  --dropdown-backdrop-filter: saturate(1.5) blur(20px);
   --dropdown-box-shadow: 0 10px 30px rgba(0, 0, 20, 0.2),
     0 2px 10px rgba(0, 0, 20, 0.05), inset 0 -1px 2px rgba(255, 255, 255, 0.025);
 
@@ -217,7 +215,6 @@ $semantics: (
     --dialog-backdrop-background: hsla(240, 10%, 20%, 0.8);
   }
 
-  --dialog-backdrop-filter: brightness(3) blur(50px);
   --dialog-box-shadow: 0 10px 40px rgba(0, 0, 20, 0.15),
     0 2px 15px rgba(0, 0, 20, 0.05),
     inset 0 0 2px 2px rgba(255, 255, 255, 0.025);

war/src/main/scss/components/_dialogs.scss

@@ -3,9 +3,7 @@ $jenkins-dialog-padding: 1.3rem;
 .jenkins-dialog {
   border-radius: 0.6rem;
   border: none;
-  background: transparent;
   box-shadow: var(--dialog-box-shadow);
-  backdrop-filter: var(--dialog-backdrop-filter);
   animation: jenkins-dialog-animate-in 0.25s cubic-bezier(0, 0.68, 0.5, 1.5);
   overflow: hidden;
   padding: $jenkins-dialog-padding 0 0 0;