[FIXED JENKINS-38923] Link to configureTools on Jenkins 2.x.

jenkinsci · Oct 12, 2016 · 1d88164 · 1d88164
1 parent d191333
commit 1d88164
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 1 deletion.
diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
@@ -65,7 +65,15 @@ THE SOFTWARE.
       <f:entry title="${%Maven Version}">
         <div class="error">
           ${%Maven Version.error.1}&lt;br>
-          ${%Maven Version.error.2(rootURL)}
+          <!-- In Jenkins 2.x and later, tools configuration is on its own page, not the global configuration. -->
+          <j:choose>
+            <j:when test="${h.version.startsWith('1')">
+              ${%Maven Version.error.2(rootURL)}
+            </j:when>
+            <j:otherwise>
+              ${%Maven Version.error.3(rootURL)}
+            </j:otherwise>
+          </j:choose>
         </div>
       </f:entry>
     </j:if>

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.properties b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.properties
@@ -22,6 +22,7 @@
 
 Maven\ Version.error.1=Jenkins needs to know where your Maven is installed.
 Maven\ Version.error.2=Please do so from <a href="{0}/configure" target="_new">the system configuration</a>.
+Maven\ Version.error.3=Please do so from <a href="{0}/configureTools" target="_new">the system configuration</a>.
 criteriaDescription=Should the post-build steps run only for successful builds, etc.
 runIfStable=Run only if build succeeds
 runIfSuccessful=Run only if build succeeds or is unstable

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_da.properties b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_da.properties
@@ -22,6 +22,7 @@
 
 Disable\ automatic\ artifact\ archiving=Sl\u00e5 automatisk artifaktarkivering fra
 Maven\ Version.error.2=Dette g\u00f8res fra <a href="{0}/configure" target="_new">system konfigurationen</a>.
+Maven\ Version.error.3=Dette g\u00f8res fra <a href="{0}/configureTools" target="_new">system konfigurationen</a>.
 Build=Byg
 Maven\ Version=Maven version
 Use\ private\ Maven\ repository=Benyt et privat Mavenarkiv

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_de.properties b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_de.properties
@@ -27,6 +27,7 @@ Build=Build
 Maven\ Version=Maven-Version
 Maven\ Version.error.1=Jenkins muss Ihr Maven-Installationsverzeichnis kennen.
 Maven\ Version.error.2=Bitte geben Sie dieses in der <a href="{0}/configure" target="_new">Systemkonfiguration</a> an.
+Maven\ Version.error.3=Bitte geben Sie dieses in der <a href="{0}/configureTools" target="_new">Systemkonfiguration</a> an.
 Root\ POM=Stamm-POM
 Goals\ and\ options=Goals und Optionen
 Incremental\ build\ -\ only\ build\ changed\ modules=Inkrementelles Bauen - baut nur geänderte Module

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_es.properties b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_es.properties
@@ -22,6 +22,7 @@
 
 Maven\ Version.error.1=Jenkins necesita saber donde está instalado Maven.
 Maven\ Version.error.2=Configuraló en la pantalla de <a href="{0}/configure" target="_new">configuración del sistema</a>.
+Maven\ Version.error.3=Configuraló en la pantalla de <a href="{0}/configureTools" target="_new">configuración del sistema</a>.
 Root\ POM=Fichero POM raíz
 Build=Proyecto
 Goals\ and\ options=Goles y opciones

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties
@@ -32,6 +32,7 @@ Use\ private\ maven\ repository=Utiliser un repository Maven priv\u00e9
 Goals\ and\ options=Goals et options
 Maven\ Version.error.1=Jenkins a besoin de savoir o\u00f9 Maven est install\u00c8.
 Maven\ Version.error.2=Veuillez le faire dans <a href="{0}/configure" target="_new">la configuration syst\u00cbme</a>.
+Maven\ Version.error.3=Veuillez le faire dans <a href="{0}/configureTools" target="_new">la configuration syst\u00cbme</a>.
 Build\ whenever\ a\ SNAPSHOT\ dependency\ is\ built=Lance un build \u00e0 chaque fois qu''une d\u00e9pendance SNAPSHOT est construite
 Run\ Headless=Ex\u00e9cuter sans environnement graphique
 Disable\ automatic\ artifact\ archiving=D\u00e9sactive l'achivage automatique des artefacts

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ja.properties b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_ja.properties
@@ -24,6 +24,7 @@ Build=\u30d3\u30eb\u30c9
 Maven\ Version=\u4f7f\u7528\u3059\u308bMaven
 Maven\ Version.error.1=Maven\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u5148\u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 Maven\ Version.error.2=<a href="{0}/configure" target="_new">\u30b7\u30b9\u30c6\u30e0\u306e\u8a2d\u5b9a</a>\u3067\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+Maven\ Version.error.3=<a href="{0}/configureTools" target="_new">\u30b7\u30b9\u30c6\u30e0\u306e\u8a2d\u5b9a</a>\u3067\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 Root\ POM=\u30eb\u30fc\u30c8POM
 Goals\ and\ options=\u30b4\u30fc\u30eb\u3068\u30aa\u30d7\u30b7\u30e7\u30f3
 Incremental\ build\ -\ only\ build\ changed\ modules=\u30a4\u30f3\u30af\u30ea\u30e1\u30f3\u30bf\u30eb\u30d3\u30eb\u30c9 - \u5909\u66f4\u3055\u308c\u305f\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u307f\u30d3\u30eb\u30c9

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_pt_BR.properties
@@ -28,6 +28,7 @@ Build\ Settings=Configura\u00e7\u00f5es de Constru\u00e7\u00e3o
 Disable\ automatic\ artifact\ archiving=Desabilitar arquivamento autom\u00e1tico de artefatos
 # Please do so from <a href="{0}/configure" target="_new">the system configuration</a>.
 Maven\ Version.error.2=Favor fazer <a href="{0}/configure" target="_new">a configura\u00e7\u00e3o do sistema</a>.
+Maven\ Version.error.3=Favor fazer <a href="{0}/configureTools" target="_new">a configura\u00e7\u00e3o do sistema</a>.
 Use\ private\ Maven\ repository=Usar reposit\u00f3rio privado Maven
 Incremental\ build\ -\ only\ build\ changed\ modules=Compila\u00e7\u00e3o incremental - apenas construir m\u00f3dulos alterados
 # Jenkins needs to know where your Maven is installed.

diff --git a/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_zh_TW.properties b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_zh_TW.properties
@@ -29,6 +29,7 @@ Build=\u5efa\u7f6e
 Maven\ Version=Maven \u7248\u672c
 Maven\ Version.error.1=Jenkins \u9700\u8981\u77e5\u9053\u60a8 Maven 2 \u6216 3 \u5b89\u88dd\u7684\u5730\u65b9\u3002
 Maven\ Version.error.2=\u8acb\u5230<a href="{0}/configure" target="_new">\u300c\u7cfb\u7d71\u8a2d\u5b9a\u300d</a>\u88e1\u8a2d\u5b9a\u3002
+Maven\ Version.error.3=\u8acb\u5230<a href="{0}/configureTools" target="_new">\u300c\u7cfb\u7d71\u8a2d\u5b9a\u300d</a>\u88e1\u8a2d\u5b9a\u3002
 Root\ POM=Root POM
 Goals\ and\ options=Goal \u53ca\u9078\u9805
 Incremental\ build\ -\ only\ build\ changed\ modules=\u7d2f\u9032\u5efa\u7f6e\uff0c\u53ea\u5efa\u7f6e\u6709\u8b8a\u52d5\u7684\u6a21\u7d44