Merge branch 'master' of github.com:jenkinsci/jenkins

Conflicts:
	changelog.html

changelog.html

@@ -64,6 +64,9 @@ Upcoming changes</a>
   <li class='major bug'>
     Displaying massive test suite results could bring down Jenkins.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15818">issue 15818</a>)
+  <li class="major bug">
+    Jenkins kicks off the wrong downstream builds for Maven.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15367">issue 15367</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
@@ -74,9 +77,6 @@ Upcoming changes</a>
   <li class="major bug">
     <code>ArrayIndexOutOfBoundsException</code> or <code>StringIndexOutOfBoundsException</code> launching processes such as Mercurial polling. (Regression in 1.489.)
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15733">issue 15733</a>)
-  <li class=bug>
-    Jenkins kicks off the wrong downstream builds for Maven.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15367">issue 15367</a>)
   <li class=rfe>
     Support failsafe the same way as surefire in maven2 jobs
 </ul>

core/src/main/java/hudson/tasks/Maven.java

@@ -394,6 +394,12 @@ public class Maven extends Builder {
             return "/help/project-config/maven.html";
         }
 
+        @Override
+        public String getHelpFile(String fieldName) {
+            if (fieldName.equals("globalSettings")) fieldName = "settings"; // same help file
+            return super.getHelpFile(fieldName);
+        }
+
         public String getDisplayName() {
             return Messages.Maven_DisplayName();
         }

core/src/main/resources/hudson/tasks/Maven/config.jelly

@@ -50,11 +50,14 @@ THE SOFTWARE.
     <f:entry field="usePrivateRepository" title="${%Use private Maven repository}" help="/plugin/maven-plugin/private-repository.html">
       <f:checkbox checked="${it.usesPrivateRepository()}" />
     </f:entry>
-    <f:entry title="${%Settings file}" field="settings" help="/help/tasks/maven/maven-settings.html">
-       <f:dropdownDescriptorSelector descriptors="${descriptor.settingsProviders}"/>
+    <f:dropdownDescriptorSelector title="${%Settings file}" descriptors="${descriptor.settingsProviders}" field="settings"/>
+<!--
+    <f:entry   help="/help/tasks/maven/maven-settings.html">
+
     </f:entry>
-    <f:entry title="${%Global Settings file}" field="globalSettings" help="/help/tasks/maven/maven-settings.html">
-       <f:dropdownDescriptorSelector descriptors="${descriptor.globalSettingsProviders}"/>
-    </f:entry>          
+    <f:entry   help="/help/tasks/maven/maven-settings.html">
+    </f:entry>
+-->
+    <f:dropdownDescriptorSelector title="${%Global Settings file}" field="globalSettings" descriptors="${descriptor.globalSettingsProviders}"/>
   </f:advanced>
 </j:jelly>
\ No newline at end of file

maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java

@@ -1182,6 +1182,13 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
             mavenValidationLevels.put( "LEVEL_STRICT", ModelBuildingRequest.VALIDATION_LEVEL_STRICT );
         }
 
+        @Override
+        public String getHelpFile(String fieldName) {
+            String v = super.getHelpFile(fieldName);
+            if (v!=null)    return v;
+            return Jenkins.getInstance().getDescriptor(Maven.class).getHelpFile(fieldName);
+        }
+
         public List<SettingsProviderDescriptor> getSettingsProviders() {
             return Jenkins.getInstance().getDescriptorList(SettingsProvider.class);
         }

maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly

@@ -113,14 +113,8 @@ THE SOFTWARE.
         </select>
       </f:entry>     
       
-      <f:entry title="${%Settings file}" field="settings" help="/help/tasks/maven/maven-settings.html">
-          <f:dropdownDescriptorSelector descriptors="${descriptor.settingsProviders}"/>
-      </f:entry>
-
-      <f:entry title="${%Global Settings file}" field="globalSettings" help="/help/tasks/maven/maven-settings.html">
-          <f:dropdownDescriptorSelector descriptors="${descriptor.globalSettingsProviders}"/>
-      </f:entry>      
-
+      <f:dropdownDescriptorSelector title="${%Settings file}" field="settings" descriptors="${descriptor.settingsProviders}"/>
+      <f:dropdownDescriptorSelector title="${%Global Settings file}" field="globalSettings"  descriptors="${descriptor.globalSettingsProviders}"/>
     </f:advanced>
   </f:section>