Merge r1035075 TUSCANY-3762: Fix comments in pom.xml files and clean up handling of filtered resource files
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1035081 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/eclipse/features/core/pom.xml b/tools/eclipse/features/core/pom.xml
index 9c912b0..01249d8 100644
--- a/tools/eclipse/features/core/pom.xml
+++ b/tools/eclipse/features/core/pom.xml
@@ -57,7 +57,7 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
- <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+ <!-- TUSCANY-3762: Copy resource files that need to be filtered -->
<execution>
<id>copy-filtered-resources</id>
<phase>generate-resources</phase>
@@ -93,12 +93,12 @@
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
- <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+ <!-- TUSCANY-3762: Delete copied filtered resource files -->
<fileset>
<directory>${basedir}</directory>
<includes>
<include>NOTICE</include>
- <include>META-INF/MANIFEST.MF</include>
+ <include>META-INF/**</include>
<include>feature.xml</include>
</includes>
</fileset>
diff --git a/tools/eclipse/plugins/core/pom.xml b/tools/eclipse/plugins/core/pom.xml
index f33c744..ad9c7da 100644
--- a/tools/eclipse/plugins/core/pom.xml
+++ b/tools/eclipse/plugins/core/pom.xml
@@ -88,7 +88,7 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
- <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+ <!-- TUSCANY-3762: Copy resource files that need to be filtered -->
<execution>
<id>copy-filtered-resources</id>
<phase>generate-resources</phase>
@@ -124,14 +124,14 @@
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
- <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+ <!-- TUSCANY-3762: Delete copied filtered resource files -->
<fileset>
<directory>${basedir}</directory>
<includes>
<include>about.ini</include>
<include>about_files/NOTICE</include>
- <include>META-INF/MANIFEST.MF</include>
- <include>org/apache/tuscany/sca/core/feature.version</include>
+ <include>META-INF/**</include>
+ <include>org/**</include>
</includes>
</fileset>
</filesets>
diff --git a/tools/eclipse/site/updatesite/pom.xml b/tools/eclipse/site/updatesite/pom.xml
index d383231..9efee93 100644
--- a/tools/eclipse/site/updatesite/pom.xml
+++ b/tools/eclipse/site/updatesite/pom.xml
@@ -65,7 +65,7 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
- <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+ <!-- TUSCANY-3762: Copy resource files that need to be filtered -->
<execution>
<id>copy-filtered-resources</id>
<phase>generate-resources</phase>
@@ -112,13 +112,13 @@
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
- <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+ <!-- TUSCANY-3762: Delete copied filtered resource files -->
<fileset>
<directory>${basedir}</directory>
<includes>
<include>site.xml</include>
<include>NOTICE</include>
- <include>src/main/assembly/updatesite.xml</include>
+ <include>src/**</include>
</includes>
</fileset>
</filesets>
