Author: nash
Date: Wed Apr 13 10:26:04 2011
New Revision: 1091729
URL: http://svn.apache.org/viewvc?rev=1091729&view=rev
Log:
TUSCANY-3858: Eclipse update site doesn't build correctly from a top-level build
Modified:
tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
Modified: tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml?rev=1091729&r1=1091728&r2=1091729&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml Wed Apr 13
10:26:04 2011
@@ -38,6 +38,11 @@
</dependencies>
<build>
+ <!-- TUSCANY-3858: Specify filters here, not in plugin execution
configuration -->
+ <filters>
+ <filter>${basedir}/../../target/filter.properties</filter>
+ </filters>
+
<resources>
<resource>
<directory>${basedir}</directory>
@@ -66,9 +71,6 @@
</goals>
<configuration>
<outputDirectory>${basedir}</outputDirectory>
- <filters>
-
<filter>${basedir}/../../target/filter.properties</filter>
- </filters>
<resources>
<resource>
<directory>${basedir}/filtered-resources</directory>
Modified: tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml?rev=1091729&r1=1091728&r2=1091729&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml Wed Apr 13
10:26:04 2011
@@ -68,6 +68,11 @@
</dependencies>
<build>
+ <!-- TUSCANY-3858: Specify filters here, not in plugin execution
configuration -->
+ <filters>
+ <filter>${basedir}/../../target/filter.properties</filter>
+ </filters>
+
<resources>
<resource>
<directory>${basedir}</directory>
@@ -97,9 +102,6 @@
</goals>
<configuration>
<outputDirectory>${basedir}</outputDirectory>
- <filters>
-
<filter>${basedir}/../../target/filter.properties</filter>
- </filters>
<resources>
<resource>
<directory>${basedir}/filtered-resources</directory>
Modified: tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml?rev=1091729&r1=1091728&r2=1091729&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml Wed Apr 13
10:26:04 2011
@@ -46,6 +46,11 @@
</dependencies>
<build>
+ <!-- TUSCANY-3858: Specify filters here, not in plugin execution
configuration -->
+ <filters>
+ <filter>${basedir}/../../target/filter.properties</filter>
+ </filters>
+
<resources>
<resource>
<directory>${basedir}</directory>
@@ -74,9 +79,6 @@
</goals>
<configuration>
<outputDirectory>${basedir}</outputDirectory>
- <filters>
-
<filter>${basedir}/../../target/filter.properties</filter>
- </filters>
<resources>
<resource>
<directory>${basedir}/filtered-resources</directory>