Author: aheritier
Date: Wed Sep 14 07:06:20 2005
New Revision: 280860
URL: http://svn.apache.org/viewcvs?rev=280860&view=rev
Log:
Replace the multiproject:goal by the reactor (workaround for MAVEN-1691).
Fix all tests in all plugins.
Removed:
maven/maven-1/plugins/trunk/abbot/src/plugin-test/project.properties
maven/maven-1/plugins/trunk/clover/src/plugin-test/project.properties
maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/project.properties
maven/maven-1/plugins/trunk/eclipse/src/plugin-test/project.properties
Modified:
maven/maven-1/plugins/trunk/abbot/src/plugin-test/maven.xml
maven/maven-1/plugins/trunk/clover/src/plugin-test/maven.xml
maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml
maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml
maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties
maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maven.xml
maven/maven-1/plugins/trunk/maven.xml
Modified: maven/maven-1/plugins/trunk/abbot/src/plugin-test/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/abbot/src/plugin-test/maven.xml?rev=280860&r1=280859&r2=280860&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/abbot/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/abbot/src/plugin-test/maven.xml Wed Sep 14
07:06:20 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core">
+<project xmlns:j="jelly:core" xmlns:maven="jelly:maven">
<goal name="testPlugin">
<echo>This plugin must be tested manually (with the testPlugin-manual
goal) as it requires defining a build.properties containing
environment-dependent configuration.</echo>
@@ -13,8 +13,7 @@
environment variable must be set. -->
<goal name="testPlugin-manual">
- <j:set var="goal" value="dist"/>
- <attainGoal name="multiproject:goal"/>
+ <maven:reactor basedir="${basedir}" includes="*/project.xml" goals="dist"
banner="Test" ignoreFailures="false"/>
</goal>
</project>
Modified: maven/maven-1/plugins/trunk/clover/src/plugin-test/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/clover/src/plugin-test/maven.xml?rev=280860&r1=280859&r2=280860&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/clover/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/clover/src/plugin-test/maven.xml Wed Sep 14
07:06:20 2005
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-->
-<project default="testPlugin" xmlns:j="jelly:core">
+<project default="testPlugin" xmlns:j="jelly:core" xmlns:maven="jelly:maven">
<goal name="testPlugin">
- <j:set var="goal" value="testPlugin"/>
- <attainGoal name="multiproject:goal"/>
+ <maven:reactor basedir="${basedir}" includes="test*/project.xml"
goals="testPlugin" banner="Test" ignoreFailures="false"/>
</goal>
</project>
Modified: maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml?rev=280860&r1=280859&r2=280860&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml
(original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/src/plugin-test/maven.xml Wed Sep
14 07:06:20 2005
@@ -15,14 +15,10 @@
* limitations under the License.
*/
-->
-<project xmlns:util="jelly:util" xmlns:j="jelly:core">
+<project xmlns:util="jelly:util" xmlns:j="jelly:core"
xmlns:maven="jelly:maven">
<goal name="testPlugin">
-
- <!-- Generate project artifacts -->
- <j:set var="goal" value="testPlugin"/>
- <attainGoal name="multiproject:goal"/>
-
+ <maven:reactor basedir="${basedir}" includes="*/project.xml"
goals="testPlugin" banner="Test" ignoreFailures="false"/>
</goal>
</project>
Modified: maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml?rev=280860&r1=280859&r2=280860&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/maven.xml Wed Sep 14
07:06:20 2005
@@ -20,6 +20,7 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:x="jelly:xml"
+ xmlns:maven="jelly:maven"
xmlns:assert="assert">
<goal name="testPlugin">
@@ -30,8 +31,7 @@
<goal name="fixture">
<!-- Setup -->
- <j:set var="goal" value="clean"/>
- <attainGoal name="multiproject:goal"/>
+ <maven:reactor basedir="${maven.multiproject.basedir}"
includes="${maven.multiproject.includes}"
excludes="${maven.multiproject.excludes}" goals="clean" banner="Clean"
ignoreFailures="false"/>
<attainGoal name="clean"/>
<!-- Call goal to test -->
Modified:
maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties?rev=280860&r1=280859&r2=280860&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties
(original)
+++ maven/maven-1/plugins/trunk/dashboard/src/plugin-test/project.properties
Wed Sep 14 07:06:20 2005
@@ -18,5 +18,5 @@
maven.multiproject.basedir = ${basedir}
maven.multiproject.includes = */project.xml
maven.multiproject.excludes = common/project.xml
-
+maven.multiproject.navigation = aggregate
maven.multiproject.site.goals = site,dashboard:report-single
Modified: maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maven.xml?rev=280860&r1=280859&r2=280860&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/src/plugin-test/maven.xml Wed Sep 14
07:06:20 2005
@@ -15,14 +15,10 @@
* limitations under the License.
*/
-->
-<project xmlns:util="jelly:util" xmlns:j="jelly:core">
+<project xmlns:util="jelly:util" xmlns:j="jelly:core"
xmlns:maven="jelly:maven">
<goal name="testPlugin">
-
- <!-- Generate project artifacts -->
- <j:set var="goal" value="testPlugin"/>
- <attainGoal name="multiproject:goal"/>
-
+ <maven:reactor basedir="${basedir}" includes="*/project.xml"
goals="testPlugin" banner="Test" ignoreFailures="false"/>
</goal>
</project>
Modified: maven/maven-1/plugins/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/maven.xml?rev=280860&r1=280859&r2=280860&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/maven.xml (original)
+++ maven/maven-1/plugins/trunk/maven.xml Wed Sep 14 07:06:20 2005
@@ -15,20 +15,15 @@
* limitations under the License.
*/
-->
-<project xmlns:ant="jelly:ant" xmlns:i="jelly:interaction"
xmlns:j="jelly:core">
+<project xmlns:ant="jelly:ant" xmlns:i="jelly:interaction"
xmlns:j="jelly:core" xmlns:maven="jelly:maven">
<goal name="plugins:install-all" description="Install all plugins">
- <j:set var="goal" value="clean,plugin:install"/>
- <attainGoal name="multiproject:goal"/>
+ <maven:reactor basedir="${basedir}" includes="*/project.xml"
excludes="${maven.multiproject.excludes}" goals="clean,plugin:install"
banner="Install" ignoreFailures="false"/>
</goal>
<goal name="plugins:repository-deploy-all" description="Deploy all plugins
in a remote repository">
- <j:set var="goal" value="clean,plugin:repository-deploy"/>
- <attainGoal name="multiproject:goal"/>
+ <maven:reactor basedir="${basedir}" includes="*/project.xml"
excludes="${maven.multiproject.excludes}"
goals="clean,plugin:repository-deploy" banner="Deploy" ignoreFailures="false"/>
</goal>
<goal name="plugins:test-all" description="Test all plugins">
- <j:set var="goal" value="plugin:test"/>
- <!-- The following tests are broken under any version of Maven -->
- <j:set var="maven.multiproject.excludes"
value="parent-plugin/*,aspectwerkz/*,cruisecontrol/*,dashboard/*,eclipse/*,javadoc/*,clover/*"/>
- <attainGoal name="multiproject:goal"/>
+ <maven:reactor basedir="${basedir}" includes="*/project.xml"
excludes="${maven.multiproject.excludes}" goals="plugin:test" banner="Test"
ignoreFailures="false"/>
</goal>
<goal name="plugins:site" description="Create the web site root for all
plugins">
<attainGoal name="multiproject:site"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
