Author: dkatayev Date: 2010-08-30 03:32:02 -0400 (Mon, 30 Aug 2010) New Revision: 3010 Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml Log: EXOJCR-891 added regexp for removing timestamp from *.war files Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2010-08-30 07:29:51 UTC (rev 3009) +++ jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2010-08-30 07:32:02 UTC (rev 3010) @@ -111,11 +111,14 @@ <include name="**/*.war" /> </fileset> <mapper> - <chainedmapper> - <flattenmapper /> + <firstmatchmapper> + <!-- If a timestamped SNAPSHOT is used --> + <regexpmapper from="exo.jcr.applications.(.*)-([0-9]+(.[0-9]+)*-(.*))-([0-9]{8}.[0-9]{6})-([0-9]+).war" to="\1.war" casesensitive="no" /> + <!-- Otherwise --> <globmapper from="exo.jcr.applications.*-${project.version}.war" to="*.war" casesensitive="no" /> - </chainedmapper> - </mapper> + <!-- By default keep the name --> + </firstmatchmapper> + </mapper> </move> <copy todir="${exo.projects.directory.working}/exo-tomcat/webapps/" verbose="true" flatten="true" overwrite="true"> <fileset dir="${basedir}/target/lib-binary.dir/" casesensitive="yes"> @@ -124,6 +127,23 @@ </copy> </tasks> </configuration> + <dependencies> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.8.1</version> + </dependency> + </dependencies> </plugin> </plugins> </build>