Replace the multiproject:goal by the reactor (workaround for MAVEN-1691).
Fix all tests in all plugins. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@280860 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
1 parent
45ce14dc42
commit
4c994b2b5a
11 files changed
+15
-117
No files matched your search
@@ -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>
|
||||
@@ -1,25 +0,0 @@
|
||||
# -------------------------------------------------------------------
|
||||
# Copyright 2001-2004 The Apache Software Foundation.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# P R O J E C T P R O P E R T I E S
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
# MUST specify these, even though they are the defaults, so we can run inside
|
||||
# reactor where they were already set.
|
||||
maven.multiproject.basedir=${basedir}
|
||||
maven.multiproject.includes=*/project.xml
|
||||
maven.multiproject.excludes=
|
||||
@@ -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>
|
||||
@@ -1,16 +0,0 @@
|
||||
# -------------------------------------------------------------------
|
||||
# Copyright 2005 The Apache Software Foundation.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
@@ -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>
|
||||
@@ -1,23 +0,0 @@
|
||||
# -------------------------------------------------------------------
|
||||
# Copyright 2001-2004 The Apache Software Foundation.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
# MUST specify these, even though they are the defaults, so we can run inside reactor where they were already set
|
||||
maven.multiproject.basedir=${basedir}
|
||||
maven.multiproject.includes=*/project.xml
|
||||
maven.multiproject.excludes=
|
||||
|
||||
|
||||
@@ -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 -->
|
||||
|
||||
@@ -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
|
||||
@@ -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>
|
||||
@@ -1,23 +0,0 @@
|
||||
# -------------------------------------------------------------------
|
||||
# Copyright 2001-2004 The Apache Software Foundation.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
|
||||
# MUST specify these, even though they are the defaults, so we can run inside reactor where they were already set
|
||||
maven.multiproject.basedir=${basedir}
|
||||
maven.multiproject.includes=*/project.xml
|
||||
maven.multiproject.excludes=
|
||||
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
Reference in new issue
Block a user