From: Cherian Mathew <c.mathew@bgbm.org>
Date: Tue, 15 Sep 2015 11:07:08 +0000 (+0200)
Subject: Correct webapp war name change
X-Git-Tag: remoting-3.10.0~9
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9d17060112430a35150f5aac416929bdd94ef660

Correct webapp war name change
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index eb37c35ef..049df7d6b 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -83,13 +83,7 @@
                 <move todir="./src/main/resources/etc/jetty">
                   <fileset dir="./src/main/resources/etc/jetty" />
                   <mapper type="regexp"
-                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-SNAPSHOT(\.war)"
-                    to="\1\2" />
-                </move>
-                <move todir="./src/main/resources/etc/jetty">
-                  <fileset dir="./src/main/resources/etc/jetty" />
-                  <mapper type="regexp"
-                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-[0-9.-]+(\.war)"
+                    from="(^cdmlib\-remote\-webapp).*(\.war)"
                     to="\1\2" />
                 </move>
                 <echo>Update cdmlib jars to SNAPSHOT when build with
@@ -98,13 +92,13 @@
                 <move todir="./lib">
                   <fileset dir="./lib" />
                   <mapper type="regexp"
-                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)"
+                    from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\.jar)"
                     to="\1SNAPSHOT\2" />
                 </move>
                 <move todir="./lib">
                   <fileset dir="./lib" />
                   <mapper type="regexp"
-                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)"
+                    from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-sources\.jar)"
                     to="\1SNAPSHOT\2" />                
                 </move>
               </target>