Merge branch 'hotfix/3.12.3'

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / pom.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 2138a725c5026eac957c4d4226cbdd8ea7c76180..c261a449bf53223b1a5a039c440627f240b73219 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>eu.etaxonomy</groupId>
-    <artifactId>taxeditor-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <name>CDM Library Dependencies Plugin</name>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+  <parent>\r
+    <groupId>eu.etaxonomy</groupId>\r
+    <artifactId>taxeditor-parent</artifactId>\r
+    <version>3.12.2</version>\r
+  </parent>\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
+  <packaging>eclipse-plugin</packaging>\r
+  <name>CDM Library Dependencies Plugin</name>\r
   <description>CDM Library and dependencies as a plugin</description>\r
 \r
   <build>\r
@@ -21,8 +22,8 @@
         </plugin>\r
       </plugins>\r
     </pluginManagement>\r
-    <plugins>
-      <plugin>
+    <plugins>\r
+      <plugin>\r
         <groupId>org.apache.maven.plugins</groupId>\r
         <artifactId>maven-dependency-plugin</artifactId>\r
         <version>2.4</version>\r
@@ -64,7 +65,7 @@
               <excludeTransitive>true</excludeTransitive>\r
             </configuration>\r
           </execution>\r
-        </executions>
+        </executions>\r
       </plugin>\r
       <plugin>\r
         <groupId>org.apache.maven.plugins</groupId>\r
@@ -83,14 +84,7 @@
                 <move todir="./src/main/resources/etc/jetty">\r
                   <fileset dir="./src/main/resources/etc/jetty" />\r
                   <mapper type="regexp"\r
-                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-SNAPSHOT(\.war)"\r
-                    to="\1\2" />\r
-                </move>\r
-                <move todir="./src/main/resources/etc/jetty">\r
-                  <fileset dir="./src/main/resources/etc/jetty" />\r
-                  <mapper type="regexp"\r
-                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-[0-9.-]+(\.war)"\r
-                    to="\1\2" />\r
+                    from="(^cdmlib\-remote\-webapp).*(\.war)" to="\1\2" />\r
                 </move>\r
                 <echo>Update cdmlib jars to SNAPSHOT when build with\r
                   timestamp\r
@@ -98,67 +92,38 @@
                 <move todir="./lib">\r
                   <fileset dir="./lib" />\r
                   <mapper type="regexp"\r
-                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)"\r
+                    from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\.jar)"\r
                     to="\1SNAPSHOT\2" />\r
                 </move>\r
                 <move todir="./lib">\r
                   <fileset dir="./lib" />\r
                   <mapper type="regexp"\r
-                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)"\r
-                    to="\1SNAPSHOT\2" />                \r
+                    from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-sources\.jar)"\r
+                    to="\1SNAPSHOT\2" />\r
                 </move>\r
               </target>\r
             </configuration>\r
           </execution>\r
+          <execution>\r
+            <id>remove-existing-jars</id>\r
+            <phase>clean</phase>\r
+            <goals>\r
+              <goal>run</goal>\r
+            </goals>\r
+            <configuration>\r
+              <target>\r
+                <echo>Remove all cdmlib jars</echo>\r
+                <delete>\r
+                  <fileset dir="./lib" includes="cdmlib-*" />\r
+                </delete>\r
+              </target>\r
+            </configuration>\r
+          </execution>\r
         </executions>\r
       </plugin>\r
     </plugins>\r
   </build>\r
   <profiles>\r
-    <profile>\r
-      <id>cleanCdmlibJars</id>\r
-      <build>\r
-        <plugins>\r
-          <plugin>\r
-            <artifactId>maven-clean-plugin</artifactId>\r
-            <version>2.3</version>\r
-            <configuration>\r
-              <filesets>\r
-                <fileset>\r
-                  <directory>${basedir}/lib</directory>\r
-                  <includes>\r
-                    <include>cdmlib-*</include>\r
-                  </includes>\r
-                  <followSymlinks>false</followSymlinks>\r
-                </fileset>\r
-              </filesets>\r
-            </configuration>\r
-          </plugin>\r
-        </plugins>\r
-      </build>\r
-    </profile>\r
-    <profile>\r
-      <id>cleanAllJars</id>\r
-      <build>\r
-        <plugins>\r
-          <plugin>\r
-            <artifactId>maven-clean-plugin</artifactId>\r
-            <version>2.3</version>\r
-            <configuration>\r
-              <filesets>\r
-                <fileset>\r
-                  <directory>${basedir}/lib</directory>\r
-                  <includes>\r
-                    <include>*</include>\r
-                  </includes>\r
-                  <followSymlinks>false</followSymlinks>\r
-                </fileset>\r
-              </filesets>\r
-            </configuration>\r
-          </plugin>\r
-        </plugins>\r
-      </build>\r
-    </profile>\r
     <profile>\r
       <id>copyAllJars</id>\r
       <build>\r
@@ -593,5 +558,7 @@
       <version>1.1.0.Final</version>\r
     </dependency>\r
     <!-- For Hibernate Mapping End -->\r
-  </dependencies>
-</project>
+\r
+  </dependencies>\r
+</project>\r
+