From e452bb9683f2db46162a1e08a00f673ee9614863 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 6 Feb 2006 01:38:01 +0000
Subject: [PATCH] Do not use multiproject properties to not create a conflict
 with some subprojects. For example in clover tests.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@375150 13f79535-47bb-0310-9956-ffa450edef68
---
 maven.xml          | 6 +++---
 project.properties | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/maven.xml b/maven.xml
index 98ca3cbd..1918af44 100644
--- a/maven.xml
+++ b/maven.xml
@@ -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"/>/>
diff --git a/project.properties b/project.properties
index 268baf46..f1e14ee6 100644
--- a/project.properties
+++ b/project.properties
@@ -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