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
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user