[exo-jcr-commits] exo-jcr SVN: r3195 - in jcr/trunk/applications: exo.jcr.applications.jetty and 1 other directories.

Author: tolusha Date: 2010-09-28 05:01:44 -0400 (Tue, 28 Sep 2010) New Revision: 3195 Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml Log: EXOJCR-981: remove timestamp from jar names in application bundle Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml 2010-09-28 08:03:48 UTC (rev 3194) +++ jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml 2010-09-28 09:01:44 UTC (rev 3195) @@ -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/trunk/applications/exo.jcr.applications.jetty/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-09-28 08:03:48 UTC (rev 3194) +++ jcr/trunk/applications/exo.jcr.applications.jetty/pom.xml 2010-09-28 09:01:44 UTC (rev 3195) @@ -93,6 +93,20 @@ <copy todir="${exo.projects.directory.working}/exo-jetty" verbose="false" overwrite="true"> <fileset dir="${exo.projects.directory.dependencies}/${exo.projects.app.jetty.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> <delete dir="${exo.projects.directory.working}/exo-jetty/etc" includeEmptyDirs="true" quiet="yes" /> <delete dir="${exo.projects.directory.working}/exo-jetty/contexts" includeEmptyDirs="true" quiet="yes" /> <delete dir="${exo.projects.directory.working}/exo-jetty/webapps" includeEmptyDirs="true" quiet="yes" /> Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-09-28 08:03:48 UTC (rev 3194) +++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-09-28 09:01:44 UTC (rev 3195) @@ -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>