[exo-jcr-commits] exo-jcr SVN: r3201 - in jcr/branches/1.12.x/applications: exo.jcr.applications.tomcat and 1 other directory.
Author: tolusha
Date: 2010-09-28 06:03:01 -0400 (Tue, 28 Sep 2010)
New Revision: 3201
Modified:
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
Log:
JCR-1461: Remove timestamp from names of jar-files in application bundles
Modified:
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml
===================================================================
---
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml 2010-09-28
09:51:26 UTC (rev 3200)
+++
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml 2010-09-28
10:03:01 UTC (rev 3201)
@@ -33,6 +33,7 @@
</files>
<dependencySets>
<dependencySet>
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<scope>compile</scope>
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-09-28
09:51:26 UTC (rev 3200)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2010-09-28
10:03:01 UTC (rev 3201)
@@ -98,6 +98,20 @@
<copy todir="${exo.projects.directory.working}/exo-tomcat"
verbose="false" overwrite="true">
<fileset
dir="${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"
/>
</copy>
+ <!-- Removing timestamps from SNAPSHOT jars-->
+ <move todir="${basedir}/target/lib-binary.dir/">
+ <fileset dir="${basedir}/target/lib-binary.dir/">
+ <include name="**/*.jar"/>
+ </fileset>
+ <mapper>
+ <firstmatchmapper>
+ <!-- If a timestamped SNAPSHOT is used -->
+ <regexpmapper
from="(.*)-([0-9]+(.[0-9]+)*-(.*))-([0-9]{8}.[0-9]{6})-([0-9]+).jar"
to="\1-${project.version}.jar" casesensitive="no"/>
+ <!-- By default keep the name -->
+ <flattenmapper/>
+ </firstmatchmapper>
+ </mapper>
+ </move>
<copy
todir="${exo.projects.directory.working}/exo-tomcat/lib/"
verbose="true" overwrite="true">
<fileset dir="${basedir}/target/lib-binary.dir/"
excludes="**/*.war" />
</copy>