diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 11:12:17 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 11:12:17 +0000 |
| commit | c76db6c0a69c5fcc7992e21d187d459c81c549e7 (patch) | |
| tree | 269b5cf8da0e43534c90a4b59717c54492a42f34 /sca-java-1.x/trunk | |
| parent | bd4fdf0b97c76ea3eca74a260531b1ab04e00081 (diff) | |
Merge r1002093 Fix resource exclusion patterns so that files under the target directory aren't incorrectly treated as resources
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027468 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk')
| -rw-r--r-- | sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java index de1201ea2d..bffaea8e11 100644 --- a/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java +++ b/sca-java-1.x/trunk/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java @@ -248,7 +248,7 @@ public class AntGeneratorMojo extends AbstractMojo { if (project.getResources().size() > 1) { break; } - pw.println(" <fileset dir=\".\" excludes=\"**/*.java, pom.xml, build.xml, target\"/>"); + pw.println(" <fileset dir=\".\" excludes=\"**/*.java, **/.*/**, pom.xml, build*.xml, target/**\"/>"); source = "."; } } @@ -287,7 +287,7 @@ public class AntGeneratorMojo extends AbstractMojo { if (project.getTestResources().size() > 1) { break; } - pw.println(" <fileset dir=\".\" excludes=\"**/*.java, pom.xml, build.xml, target\"/>"); + pw.println(" <fileset dir=\".\" excludes=\"**/*.java, **/.*/**, pom.xml, build*.xml, target/**\"/>"); source = "."; } } |