From: Cherian Mathew <c.mathew@bgbm.org>
Date: Wed, 23 Sep 2015 10:26:26 +0000 (+0200)
Subject: Remove profile for clean goals to delete cdmlib jars
X-Git-Tag: 3.12.0^2~135^2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9e671498ac1f520d78aabfa91f9ea8966b3f4b83

Remove profile for clean goals to delete cdmlib jars
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 7e24daa53..ada7df323 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
@@ -83,8 +84,7 @@
                 <move todir="./src/main/resources/etc/jetty">
                   <fileset dir="./src/main/resources/etc/jetty" />
                   <mapper type="regexp"
-                    from="(^cdmlib\-remote\-webapp).*(\.war)"
-                    to="\1\2" />
+                    from="(^cdmlib\-remote\-webapp).*(\.war)" to="\1\2" />
                 </move>
                 <echo>Update cdmlib jars to SNAPSHOT when build with
                   timestamp
@@ -99,60 +99,31 @@
                   <fileset dir="./lib" />
                   <mapper type="regexp"
                     from="(^cdmlib\-.*\-\d+\.\d+\.\d+\-)[\d.-]+(\-sources\.jar)"
-                    to="\1SNAPSHOT\2" />                
+                    to="\1SNAPSHOT\2" />
                 </move>
               </target>
             </configuration>
           </execution>
+          <execution>
+            <id>remove-existing-jars</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <echo>Remove all cdmlib jars</echo>
+                <delete>
+                  <fileset dir="./lib" includes="cdmlib-*" />
+                </delete>
+              </target>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
   <profiles>
-    <profile>
-      <id>cleanCdmlibJars</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-clean-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>${basedir}/lib</directory>
-                  <includes>
-                    <include>cdmlib-*</include>
-                  </includes>
-                  <followSymlinks>false</followSymlinks>
-                </fileset>
-              </filesets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>cleanAllJars</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-clean-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <filesets>
-                <fileset>
-                  <directory>${basedir}/lib</directory>
-                  <includes>
-                    <include>*</include>
-                  </includes>
-                  <followSymlinks>false</followSymlinks>
-                </fileset>
-              </filesets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>copyAllJars</id>
       <build>