brett 2004/10/23 19:07:31
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtils.java
src/test/touchstone-build Tag: MAVEN-1_0-BRANCH maven.xml
Log:
PR: MAVEN-1363
trim goal list in reactor
Revision Changes Path
No revision
No revision
1.107.4.24 +2 -2 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.107.4.23
retrieving revision 1.107.4.24
diff -u -r1.107.4.23 -r1.107.4.24
--- MavenUtils.java 19 Jul 2004 13:48:58 -0000 1.107.4.23
+++ MavenUtils.java 24 Oct 2004 02:07:31 -0000 1.107.4.24
@@ -1077,7 +1077,7 @@
List goals = new ArrayList();
while ( tok.hasMoreTokens() )
{
- goals.add( tok.nextToken() );
+ goals.add( tok.nextToken().trim() );
}
return goals;
}
No revision
No revision
1.43.4.22 +11 -0 maven/src/test/touchstone-build/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/maven.xml,v
retrieving revision 1.43.4.21
retrieving revision 1.43.4.22
diff -u -r1.43.4.21 -r1.43.4.22
--- maven.xml 24 Sep 2004 10:38:44 -0000 1.43.4.21
+++ maven.xml 24 Oct 2004 02:07:31 -0000 1.43.4.22
@@ -210,6 +210,7 @@
<attainGoal name="test-preGoal-counter" />
<attainGoal name="test-postGoal-counter" />
+ <attainGoal name="test-goal-trimming-reactor" />
<attainGoal name="test-reactor-resources" />
<attainGoal name="test-plugin-attainment-reactor" />
<attainGoal name="test-plugin-attainment-reactor-two-goals" />
@@ -710,6 +711,16 @@
<goal name="test-context-switch">
<attainGoal name="touchstone-partner:test-context-switch" />
+ </goal>
+
+ <goal name="test-goal-trimming-reactor">
+ <maven:reactor
+ basedir="${basedir}"
+ includes="src/reactor-build/failProperty/success-1/project.xml"
+ goals="touchstone-goal-A, build:start"
+ banner="Testing"
+ ignoreFailures="false"
+ />
</goal>
<goal name="test-plugin-attainment-reactor">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
