From ef4096c7da86eb7e81b167aed3109a766e31ffe3 Mon Sep 17 00:00:00 2001 From: abayer Date: Wed, 22 Jul 2009 17:24:48 +0000 Subject: [PATCH] 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 | 2 +- .../src/main/java/hudson/maven/MavenModuleSet.java | 8 ++++---- .../hudson/maven/MavenModuleSet/configure-entries.jelly | 4 ++-- ...-upstream-changes.html => ignore-upstrem-changes.html} | 0 ...eam-changes_fr.html => ignore-upstrem-changes_fr.html} | 0 ...eam-changes_ja.html => ignore-upstrem-changes_ja.html} | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename war/resources/help/maven/{ignore-upstream-changes.html => ignore-upstrem-changes.html} (100%) rename war/resources/help/maven/{ignore-upstream-changes_fr.html => ignore-upstrem-changes_fr.html} (100%) rename war/resources/help/maven/{ignore-upstream-changes_ja.html => ignore-upstrem-changes_ja.html} (100%) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModule.java b/maven-plugin/src/main/java/hudson/maven/MavenModule.java index 6a29a2e6a8..bc46209e7b 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModule.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModule.java @@ -349,7 +349,7 @@ public final class MavenModule extends AbstractMavenProject modules = new HashMap(); diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 608db0fc38..fa7a0fa1f7 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -124,7 +124,7 @@ public final class MavenModuleSet extends AbstractMavenProject * 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 + checked="${h.defaultToTrue(!it.ignoreUpstremChanges())}" /> diff --git a/war/resources/help/maven/ignore-upstream-changes.html b/war/resources/help/maven/ignore-upstrem-changes.html similarity index 100% rename from war/resources/help/maven/ignore-upstream-changes.html rename to war/resources/help/maven/ignore-upstrem-changes.html diff --git a/war/resources/help/maven/ignore-upstream-changes_fr.html b/war/resources/help/maven/ignore-upstrem-changes_fr.html similarity index 100% rename from war/resources/help/maven/ignore-upstream-changes_fr.html rename to war/resources/help/maven/ignore-upstrem-changes_fr.html diff --git a/war/resources/help/maven/ignore-upstream-changes_ja.html b/war/resources/help/maven/ignore-upstrem-changes_ja.html similarity index 100% rename from war/resources/help/maven/ignore-upstream-changes_ja.html rename to war/resources/help/maven/ignore-upstrem-changes_ja.html