[FIXED JENKINS-38923] Link to configureTools on Jenkins 2.x. (#82)

jenkinsci · Oct 14, 2016 · de7d59a · de7d59a
1 parent c91da6e
commit de7d59a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
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 tool 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_fr.properties b/src/main/resources/hudson/maven/MavenModuleSet/configure-entries_fr.properties
@@ -44,4 +44,4 @@ Add\ pre-build\ step=Ajouter une \u00E9tape pr\u00E9-build
 Post-Build\ Run\ Criteria=Crit\u00E8re pour ex\u00E9cuter le post-build
 Steps\ to\ run\ after\ mvn\ build=\u00C9tapes \u00E0 lancer apr\u00E8s le build maven
 Steps\ to\ run\ before\ mvn\ build=\u00C9tapes \u00E0 lancer avant le build maven
-Disable\ triggering\ of\ downstream\ projects=D\u00e9sactive le lancement des projets en aval
+Disable\ triggering\ of\ downstream\ projects=D\u00e9sactive le lancement des projets en aval