Argh. Rolling back last commit when I realized that "ignoreUpstremChanges" is...

Argh. Rolling back last commit when I realized that "ignoreUpstremChanges" is locked into the config.xml for projects already.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20054 71c3de6d-444a-0410-be80-ed276b4c234a

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

@@ -349,7 +349,7 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
     }
 
     protected void buildDependencyGraph(DependencyGraph graph) {
-        if(isDisabled() || getParent().ignoreUpstreamChanges())        return;
+        if(isDisabled() || getParent().ignoreUpstremChanges())        return;
 
         Map<ModuleDependency,MavenModule> modules = new HashMap<ModuleDependency,MavenModule>();
 

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

@@ -124,7 +124,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
      * <p>
      * See HUDSON-1714.
      */
-    private boolean ignoreUpstreamChanges = false;
+    private boolean ignoreUpstremChanges = false;
 
     /**
      * Reporters configured at {@link MavenModuleSet} level. Applies to all {@link MavenModule} builds.
@@ -268,8 +268,8 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
         return usePrivateRepository;
     }
 
-    public boolean ignoreUpstreamChanges() {
-        return ignoreUpstreamChanges;
+    public boolean ignoreUpstremChanges() {
+        return ignoreUpstremChanges;
     }
 
     /**
@@ -621,7 +621,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
         mavenName = req.getParameter("maven_version");
         aggregatorStyleBuild = !req.hasParameter("maven.perModuleBuild");
         usePrivateRepository = req.hasParameter("maven.usePrivateRepository");
-        ignoreUpstreamChanges = !json.has("triggerByDependency");
+        ignoreUpstremChanges = !json.has("triggerByDependency");
 
         reporters.rebuild(req,json,MavenReporters.getConfigurableList());
         publishers.rebuild(req,json,BuildStepDescriptor.filter(Publisher.all(),this.getClass()));

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

@@ -31,9 +31,9 @@ THE SOFTWARE.
   <p:config-trigger>
     <!-- setting to ignore upstream changes is done as a pseudo-trigger -->
     <f:optionalBlock name="maven.triggerByDependency"
-        help="/help/maven/ignore-upstream-changes.html"
+        help="/help/maven/ignore-upstrem-changes.html"
         title="${%Build whenever a SNAPSHOT dependency is built}"
-        checked="${h.defaultToTrue(!it.ignoreUpstreamChanges())}" />
+        checked="${h.defaultToTrue(!it.ignoreUpstremChanges())}" />
     <p:config-upstream-pseudo-trigger />
   </p:config-trigger>