mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
[FIXED HUDSON-4491] If Maven is called with non-recursive flags, submodules are no longer parsed.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@21856 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
cfffeb86f4
commit
112ad0089c
4 files changed
+87
-29
No files matched your search
@@ -525,6 +525,14 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
|
||||
this.goals = goals;
|
||||
}
|
||||
|
||||
private boolean checkMavenOption(String shortForm, String longForm) {
|
||||
for (String t : Util.tokenize(getGoals())) {
|
||||
if(t.equals(shortForm) || t.equals(longForm))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private List<String> getMavenArgument(String shortForm, String longForm) {
|
||||
List<String> args = new ArrayList<String>();
|
||||
boolean switchFound=false;
|
||||
@@ -576,6 +584,13 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
|
||||
return props;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check for "-N" or "--non-recursive" in the Maven goals/options.
|
||||
*/
|
||||
public boolean isNonRecursive() {
|
||||
return checkMavenOption("-N", "--non-recursive");
|
||||
}
|
||||
|
||||
/**
|
||||
* Possibly null, whitespace-separated (including TAB, NL, etc) VM options
|
||||
* to be used to launch Maven process.
|
||||
|
||||
Reference in new issue
Block a user