Author: aheritier
Date: Sun Feb 5 17:38:01 2006
New Revision: 375150
URL: http://svn.apache.org/viewcvs?rev=375150&view=rev
Log:
Do not use multiproject properties to not create a conflict with some
subprojects. For example in clover tests.
Modified:
maven/maven-1/plugins/trunk/maven.xml
maven/maven-1/plugins/trunk/project.properties
Modified: maven/maven-1/plugins/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/maven.xml?rev=375150&r1=375149&r2=375150&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/maven.xml (original)
+++ maven/maven-1/plugins/trunk/maven.xml Sun Feb 5 17:38:01 2006
@@ -17,13 +17,13 @@
-->
<project xmlns:maven="jelly:maven">
<goal name="plugins:install-all" description="Install all plugins">
- <maven:reactor basedir="${basedir}"
includes="${maven.multiproject.includes}"
excludes="${maven.multiproject.excludes}" goals="clean,plugin:install"
banner="Install" ignoreFailures="false"/>
+ <maven:reactor basedir="${basedir}"
includes="${maven.build.plugins.includes}"
excludes="${maven.build.plugins.excludes}" goals="clean,plugin:install"
banner="Install" ignoreFailures="false"/>
</goal>
<goal name="plugins:repository-deploy-all" description="Deploy all plugins
in a remote repository">
- <maven:reactor basedir="${basedir}"
includes="${maven.multiproject.includes}"
excludes="${maven.multiproject.excludes}"
goals="clean,plugin:repository-deploy" banner="Deploy" ignoreFailures="false"/>
+ <maven:reactor basedir="${basedir}"
includes="${maven.build.plugins.includes}"
excludes="${maven.build.plugins.excludes}"
goals="clean,plugin:repository-deploy" banner="Deploy" ignoreFailures="false"/>
</goal>
<goal name="plugins:test-all" description="Test all plugins">
- <maven:reactor basedir="${basedir}"
includes="${maven.multiproject.includes}"
excludes="${maven.multiproject.excludes}" goals="plugin:test" banner="Test"
ignoreFailures="false"/>
+ <maven:reactor basedir="${basedir}"
includes="${maven.build.plugins.includes}"
excludes="${maven.build.plugins.excludes}" goals="plugin:test" banner="Test"
ignoreFailures="false"/>
</goal>
<goal name="plugins:site" description="Create the web site root for all
plugins">
<maven:maven descriptor="${basedir}/plugins-site/project.xml"
goals="plugins:site" ignoreFailures="false"/>/>
Modified: maven/maven-1/plugins/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/project.properties?rev=375150&r1=375149&r2=375150&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/project.properties (original)
+++ maven/maven-1/plugins/trunk/project.properties Sun Feb 5 17:38:01 2006
@@ -23,5 +23,5 @@
#=====
# Multiproject plugin settings
#=====
-maven.multiproject.includes=*/project.xml
-maven.multiproject.excludes=plugin-parent/project.xml,examples/project.xml,plugins-site/project.xml
+maven.build.plugins.includes=*/project.xml
+maven.build.plugins.excludes=plugin-parent/project.xml,examples/project.xml,plugins-site/project.xml
