From 4e7ac1d7fb48b8395937dd3d13ce7007a54ee0ef Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 24 Nov 2005 18:08:51 +0000
Subject: [PATCH] PR: MPSIMIAN-11 Submitted by: Thomas Recloux
 Includes/excludes pattern does not support multiple patterns

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@348777 13f79535-47bb-0310-9956-ffa450edef68
---
 simian/plugin.jelly      | 12 ++++++------
 simian/xdocs/changes.xml |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/simian/plugin.jelly b/simian/plugin.jelly
index 6de34438..7fa44f5c 100644
--- a/simian/plugin.jelly
+++ b/simian/plugin.jelly
@@ -61,9 +61,9 @@
     <ant:simian threshold="${maven.simian.linecount}">
       <formatter type="plain" toFile="${maven.build.dir}/simian-raw-report.log"/>
       <formatter type="xml" toFile="${maven.build.dir}/simian-raw-report.xml"/>
-      <ant:fileset dir="${pom.build.sourceDirectory}">
-        <ant:include name="${maven.simian.includes}"/>
-        <ant:exclude name="${maven.simian.excludes}"/>
+      <ant:fileset dir="${pom.build.sourceDirectory}"
+                    excludes="${maven.simian.excludes}" 
+                    includes="${maven.simian.includes}">
         <!-- FIXME: This is a bad cut and paste -->
         <!-- handle source modifications -->
         <j:forEach var="sm" items="${pom.build.sourceModifications}">
@@ -83,9 +83,9 @@
       <j:set var="includeTests" value="${maven.simian.includetests}"/>
       <j:if test="${includeTests == 'true'}">
         <j:if test="${unitTestSourcesPresent == 'true'}">
-          <ant:fileset dir="${pom.build.unitTestSourceDirectory}">
-            <ant:include name="${maven.simian.testincludes}"/>
-            <ant:exclude name="${maven.simian.testexcludes}"/>          
+          <ant:fileset dir="${pom.build.unitTestSourceDirectory}"
+                        excludes="${maven.simian.testexcludes}" 
+                        includes="${maven.simian.testincludes}">
           </ant:fileset>
         </j:if>
       </j:if>
diff --git a/simian/xdocs/changes.xml b/simian/xdocs/changes.xml
index 2eba205f..22d4b289 100644
--- a/simian/xdocs/changes.xml
+++ b/simian/xdocs/changes.xml
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="SVN">
+      <action dev="ltheussl" type="fix" issue="MPSIMIAN-11" due-to="Thomas Recloux">Includes/excludes pattern does not support multiple patterns.</action>
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
           <li>ant v1.5.3-1 -> v1.6.5</li>
