Merge branch 'master' into web-fragments

Vlatombe · Vlatombe · commit d3beede07d72 · 2025-01-27T09:28:12.000+01:00
diff --git a/core/src/main/resources/hudson/lifecycle/Messages.properties b/core/src/main/resources/hudson/lifecycle/Messages.properties
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.DisplayName=Install as Windows Service
-WindowsInstallerLink.Description=Installs Jenkins as a Windows service to this system, so that Jenkins starts automatically when the machine boots.
 WindowsSlaveInstaller.ConfirmInstallation=This will install an agent as a Windows service, so that a Jenkins agent starts automatically when the machine boots.
 WindowsSlaveInstaller.DotNetRequired=.NET Framework 4.0 or later is required for this feature
 WindowsSlaveInstaller.InstallationSuccessful=Installation was successful. Would you like to start the service now?
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_bg.properties b/core/src/main/resources/hudson/lifecycle/Messages_bg.properties
@@ -20,11 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.DisplayName=\
- Инсталиране като услуга на Windows
-WindowsInstallerLink.Description=\
- Инсталиране на Jenkins като услуга на инсталирания на тази система Windows, за\
- да може той да се стартира заедно с машината.
 WindowsSlaveInstaller.DotNetRequired=\
  За това се изисква .NET Framework, версия 4.0 или по-висока
 WindowsSlaveInstaller.InstallationSuccessful=\
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_da.properties b/core/src/main/resources/hudson/lifecycle/Messages_da.properties
@@ -20,7 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.DisplayName=Installer som Windows service
 WindowsSlaveInstaller.DotNetRequired=Denne feature kræver .NET framework 4.0 eller nyere
 WindowsSlaveInstaller.InstallationSuccessful=Installationen lykkedes. Vil du gerne starte service''en nu ?
-WindowsInstallerLink.Description=Installerer Jenkins som en Windows service på denne computer, så Jenkins starter automatisk når computeren starter op.
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_de.properties b/core/src/main/resources/hudson/lifecycle/Messages_de.properties
@@ -20,10 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.DisplayName=Als Windows-Dienst installieren
-WindowsInstallerLink.Description=\
-  Installiert Jenkins als Windows-Dienst: Dadurch wird Jenkins \
-  automatisch nach einem Neustart des Rechners gestartet.
 WindowsSlaveInstaller.DotNetRequired=.NET Framework 4.0 oder höher ist für diesen Vorgang erforderlich.
 WindowsSlaveInstaller.InstallationSuccessful=Installation erfolgreich. Möchten Sie den Dienst jetzt starten?
 WindowsSlaveInstaller.ConfirmInstallation=Dies wird den Agenten als Windows-Dienst installieren, so dass er automatisch gestartet wird, wenn das System startet.
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_es.properties b/core/src/main/resources/hudson/lifecycle/Messages_es.properties
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.DisplayName=Instalar como un servicio de Windows
-WindowsInstallerLink.Description=Instalar Jenkins como un servicio de Windows en este sistema, de manera que Jenkins se inicie cuando el sistema arranque.
 WindowsSlaveInstaller.ConfirmInstallation=Esto instalará el agente como un servicio de Windows.
 WindowsSlaveInstaller.DotNetRequired=Es necesario tener instalado: .NET Framework 4.0 o posterior, para que esta característica funcione.
 WindowsSlaveInstaller.InstallationSuccessful=La instalación ha sido correcta. ¿Quieres arrancar el servicio ahora?
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_fr.properties b/core/src/main/resources/hudson/lifecycle/Messages_fr.properties
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_it.properties b/core/src/main/resources/hudson/lifecycle/Messages_it.properties
@@ -21,10 +21,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.Description=Installa Jenkins su questo sistema come \
-  servizio Windows in modo che possa avviarsi automaticamente all''avvio del \
-  sistema.
-WindowsInstallerLink.DisplayName=Installa come servizio Windows
 WindowsSlaveInstaller.ConfirmInstallation=Quest''opzione installerà un agente \
   come servizio Windows in modo da far avviare automaticamente un agente \
   Jenkins all''avvio del sistema.
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_ja.properties b/core/src/main/resources/hudson/lifecycle/Messages_ja.properties
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.DisplayName=Windowsのサービスとしてインストール
-WindowsInstallerLink.Description=マシンがブートしたときにJenkinsが自動的に開始するように、WindowsのサービスとしてJenkinsをインストールします。
 WindowsSlaveInstaller.DotNetRequired=.NET Framework 4.0 以降が必要です。
 WindowsSlaveInstaller.InstallationSuccessful=インストールが成功しました。今すぐサービスを開始しますか?
 WindowsSlaveInstaller.RootFsDoesntExist=エージェントのルートディレクトリ ''{0}'' が存在しません。
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_nl.properties b/core/src/main/resources/hudson/lifecycle/Messages_nl.properties
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_pl.properties b/core/src/main/resources/hudson/lifecycle/Messages_pl.properties
@@ -19,7 +19,5 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-WindowsInstallerLink.DisplayName=Zainstaluj jako usługę systemową
 WindowsSlaveInstaller.DotNetRequired=.NET Framework 4.0 lub nowszy jest wymagany dla tej funkcjonalności
 WindowsSlaveInstaller.InstallationSuccessful=Instalacja zakończona pomyślnie. Chcesz uruchomić usługę teraz?
-WindowsInstallerLink.Description=Zainstaluj Jenkinsa jako usługę systemową, aby uruchomić Jenkinsa automatycznie po uruchomieniu systemu.
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties b/core/src/main/resources/hudson/lifecycle/Messages_pt_BR.properties
@@ -20,9 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.DisplayName=Instalar como um serviço do Windows
 WindowsSlaveInstaller.DotNetRequired=Framework .NET 4.0 ou superior é necessário
 WindowsSlaveInstaller.InstallationSuccessful=Instalação efetuada com sucesso. Gostaria de iniciar o serviço agora?
-WindowsInstallerLink.Description=Instala o Jenkins como um serviço do Windows, então será iniciado junto com o sistema operacional
 WindowsSlaveInstaller.RootFsDoesntExist=O diretório raiz do agente '{0}' não existe
 WindowsSlaveInstaller.ConfirmInstallation=Isto irá instalar o agente como um serviço do Windows de forma que o agente do Jenkins iniciará automaticamente quando a máquina iniciar.
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_sr.properties b/core/src/main/resources/hudson/lifecycle/Messages_sr.properties
@@ -1,7 +1,5 @@
 # This file is under the MIT License by authors
 
-WindowsInstallerLink.DisplayName=Инсталирај као Windows сервис
-WindowsInstallerLink.Description=Инсталира Jenkins као Windows сервис који се аутоматско покрене када почне машина.
 WindowsSlaveInstaller.ConfirmInstallation=Операција ће инсталирати агент који се аутоматско покрене када почне машина.
 WindowsSlaveInstaller.InstallationSuccessful=Успешна инсталација. Да се желите да сада покренете сервис?
 WindowsSlaveInstaller.DotNetRequired=За то није потребно .NET Framework 4.0 или новије
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_sv_SE.properties b/core/src/main/resources/hudson/lifecycle/Messages_sv_SE.properties
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.DisplayName=Installera som Windows-tjänst
-WindowsInstallerLink.Description=Installerar Jenkins som en Windows-tjänst på detta system, så att Jenkins startar automatiskt när datorn startar.
 WindowsSlaveInstaller.ConfirmInstallation=Detta kommer att installera en agent som en Windows-tjänst, så att en Jenkins-agent startar automatiskt när datorn startar.
 WindowsSlaveInstaller.DotNetRequired=.NET Framework 4.0 eller senare krävs för den här funktionen
 WindowsSlaveInstaller.InstallationSuccessful=Installationen lyckades. Vill du starta tjänsten nu?
diff --git a/core/src/main/resources/hudson/lifecycle/Messages_zh_TW.properties b/core/src/main/resources/hudson/lifecycle/Messages_zh_TW.properties
@@ -20,7 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-WindowsInstallerLink.DisplayName=安裝成 Windows 服務
-WindowsInstallerLink.Description=將 Jenkins 安裝成 Windows 服務，開機後 Jenkins 就會自動啟動。
 WindowsSlaveInstaller.DotNetRequired=本功能需要 .NET Framework 4.0 或是更新的版本
 WindowsSlaveInstaller.InstallationSuccessful=安裝完成。您要馬上啟動服務嗎?
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly
@@ -42,7 +42,7 @@ THE SOFTWARE.
     <j:set var="simpleDecorators" value="${h.simplePageDecorators}"/>
     <html lang="${request.getLocale().toLanguageTag()}">
       <head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}">
-        <title>${%Register} [Jenkins]</title>
+        <title>${%Register} - Jenkins</title>
         <!-- we do not want bots on this page -->
         <meta name="ROBOTS" content="NOFOLLOW"/>
         <!-- mobile friendly layout -->
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_it.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_it.properties
@@ -27,7 +27,7 @@ A\ strong\ password\ is\ a\ long\ password\ that''s\ unique\ for\ every\ site.\
   massimo di sicurezza.
 Create\ account=Crea account
 Create\ an\ account!=Crea un account!
-Create\ an\ account!\ [Jenkins]=Crea un account! [Jenkins]
+Create\ an\ account!\ -\ Jenkins=Crea un account! - Jenkins
 Email=Indirizzo di posta elettronica
 Enter\ text\ as\ shown=Immettere il testo così come viene visualizzato
 Full\ name=Nome completo
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_pt_BR.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_pt_BR.properties
@@ -24,7 +24,7 @@
 Enter\ text\ as\ shown=Entre\ com\ texto\ conforme\ mostrado
 Create\ account=Criar\ conta
 Weak=Fraca
-Create\ an\ account!\ [Jenkins]=Criar\ uma\ conta!\ [Jenkins]
+Create\ an\ account!\ -\ Jenkins=Criar uma conta! - Jenkins
 Strength=Força
 Strong=Forte
 please\ sign\ in.=Por\ favor\ dê\ entrada.
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_zh_TW.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup_zh_TW.properties
@@ -22,7 +22,7 @@
 
 A\ strong\ password\ is\ a\ long\ password\ that's\ unique\ for\ every\ site.\ Try\ using\ a\ phrase\ with\ 5-6\ words\ for\ the\ best\ security.=強健的密碼擁有較多字元且在不同系統使用獨特的密碼。請試著使用包含 5~6 個單字的句子以獲得最佳安全性。
 If\ you\ already\ have\ a\ Jenkins\ account,=如果您有 Jenkins 帳戶了，
-Create\ an\ account\!\ [Jenkins]=建立新帳戶\! [Jenkins]
+Create\ an\ account\!\ -\ Jenkins=建立新帳戶\! - Jenkins
 Strength=強度
 please\ sign\ in.=請登入。
 Show=顯示
diff --git a/core/src/main/resources/jenkins/model/Jenkins/login.jelly b/core/src/main/resources/jenkins/model/Jenkins/login.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
     <!-- real deal starting here -->
     <html lang="${request.getLocale().toLanguageTag()}">
       <head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}">
-        <title>${%signIn} [Jenkins]</title>
+        <title>${%signIn} - Jenkins</title>
         <!-- we do not want bots on this page -->
         <meta name="ROBOTS" content="NOFOLLOW" />
         <!-- mobile friendly layout -->
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
@@ -109,7 +109,7 @@ THE SOFTWARE.
     ${h.checkPermission(it,permission)}
     ${h.checkAnyPermission(it, permissions)}
 
-    <title>${h.appendIfNotNull(title, ' [Jenkins]', 'Jenkins')}</title>
+    <title>${h.appendIfNotNull(title, ' - Jenkins', 'Jenkins')}</title>
 
     <link rel="stylesheet" href="${resURL}/jsbundles/styles.css" type="text/css" />
     <j:if test="${attrs.nogrid==null or attrs.nogrid.equals(false)}">
diff --git a/core/src/spotbugs/excludesFilter.xml b/core/src/spotbugs/excludesFilter.xml
@@ -342,7 +342,6 @@
           <Class name="hudson.Launcher$RemoteChannelLaunchCallable"/>
           <Class name="hudson.Launcher$RemoteLaunchCallable"/>
           <Class name="hudson.lifecycle.Lifecycle"/>
-          <Class name="hudson.lifecycle.WindowsInstallerLink"/>
           <Class name="hudson.lifecycle.WindowsServiceLifecycle"/>
           <Class name="hudson.LocalPluginManager"/>
           <Class name="hudson.logging.LogRecorder"/>
diff --git a/package.json b/package.json
@@ -26,12 +26,12 @@
     "@babel/cli": "7.26.4",
     "@babel/core": "7.26.0",
     "@babel/preset-env": "7.26.0",
-    "@eslint/js": "9.18.0",
+    "@eslint/js": "9.19.0",
     "babel-loader": "9.2.1",
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.18.0",
+    "eslint": "9.19.0",
     "eslint-config-prettier": "10.0.1",
     "eslint-formatter-checkstyle": "8.40.0",
     "globals": "15.14.0",
@@ -45,7 +45,7 @@
     "sass": "1.83.4",
     "sass-loader": "16.0.4",
     "style-loader": "4.0.0",
-    "stylelint": "16.13.2",
+    "stylelint": "16.14.0",
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard-scss": "14.0.0",
     "webpack": "5.97.1",
diff --git a/pom.xml b/pom.xml
@@ -281,7 +281,7 @@ THE SOFTWARE.
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>10.21.1</version>
+              <version>10.21.2</version>
             </dependency>
           </dependencies>
           <executions>
diff --git a/test/pom.xml b/test/pom.xml
@@ -123,7 +123,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-api</artifactId>
-        <version>1358.vfb_5780da_64cb_</version>
+        <version>1363.v03f731255494</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2388.vf1281b_a_6057b_</version>
+      <version>2389.va_b_3a_21a_c00ed</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/test/src/test/java/hudson/search/SearchTest.java b/test/src/test/java/hudson/search/SearchTest.java
@@ -115,7 +115,7 @@ public void testSearchByProjectName() throws Exception {
 
         // make sure we've fetched the testSearchByDisplayName project page
         String contents = result.getWebResponse().getContentAsString();
-        assertTrue(contents.contains(String.format("<title>%s [Jenkins]</title>", projectName)));
+        assertTrue(contents.contains(String.format("<title>%s - Jenkins</title>", projectName)));
     }
 
     @Issue("JENKINS-24433")
@@ -162,7 +162,7 @@ public void testSearchByDisplayName() throws Exception {
 
         // make sure we've fetched the testSearchByDisplayName project page
         String contents = result.getWebResponse().getContentAsString();
-        assertTrue(contents.contains(String.format("<title>%s [Jenkins]</title>", displayName)));
+        assertTrue(contents.contains(String.format("<title>%s - Jenkins</title>", displayName)));
     }
 
     @Test
@@ -190,7 +190,7 @@ public void testSearch2ProjectsWithSameDisplayName() throws Exception {
 
         // make sure we've fetched the testSearchByDisplayName project page
         String contents = result.getWebResponse().getContentAsString();
-        assertTrue(contents.contains(String.format("<title>%s [Jenkins]</title>", displayName)));
+        assertTrue(contents.contains(String.format("<title>%s - Jenkins</title>", displayName)));
         assertFalse(contents.contains(otherDisplayName));
     }
 
diff --git a/war/pom.xml b/war/pom.xml
@@ -323,7 +323,7 @@ THE SOFTWARE.
                   <!-- dependency of junit, plugin-util-api, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-api</artifactId>
-                  <version>1358.vfb_5780da_64cb_</version>
+                  <version>1363.v03f731255494</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
diff --git a/yarn.lock b/yarn.lock
