Author: markt
Date: Wed Oct 29 10:08:56 2014
New Revision: 1635086
URL: http://svn.apache.org/r1635086
Log:
Add version filtering. Patch by Pierre Viret.
Modified:
tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml
tomcat/sandbox/trunk-maven-layout/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml
Modified: tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml?rev=1635086&r1=1635085&r2=1635086&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/apache-tomcat/pom.xml Wed Oct 29 10:08:56
2014
@@ -191,7 +191,7 @@
<resources>
<resource>
<directory>src/main/resources</directory>
- <filtering>false</filtering>
+ <filtering>true</filtering>
<targetPath>${tomcat.distrib.base}</targetPath>
<excludes>
<exclude>conf/tomcat-users.xsd</exclude>
Modified: tomcat/sandbox/trunk-maven-layout/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/pom.xml?rev=1635086&r1=1635085&r2=1635086&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/pom.xml Wed Oct 29 10:08:56 2014
@@ -92,6 +92,7 @@
<excludes>
<exclude>**/*.java</exclude>
</excludes>
+ <filtering>true</filtering>
</resource>
</resources>
<pluginManagement>
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml?rev=1635086&r1=1635085&r2=1635086&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml Wed Oct 29
10:08:56 2014
@@ -77,6 +77,14 @@
<resource>
<directory>${project.build.directory}/generated-resources</directory>
</resource>
+ <resource>
+ <!-- ensure that jsp files are filtered -->
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>*.jsp</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
</webResources>
</configuration>
</plugin>
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml?rev=1635086&r1=1635085&r2=1635086&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml Wed Oct 29
10:08:56 2014
@@ -44,6 +44,7 @@
<excludes>
<exclude>architecture/*.xml</exclude>
</excludes>
+ <filtering>true</filtering>
</resource>
</resources>
<plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
