added cleanup tasks after bundle jre

diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
index 3167dc429f76db0cd24b3ca733d5abedf2ba468c..d74bb65adc017420e4884dbbf4ff1f4ff585ba27 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -24,31 +24,12 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <id>setPropertiesWithoutJRE</id>
-            <phase>validate</phase>
-            <configuration>
-              <target>
-                <copy overwrite="true" force="true"
-                  file="${basedir}/build.properties.wo.jre" tofile="${basedir}/build.properties" />
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>

         <artifactId>maven-clean-plugin</artifactId>
         <version>2.6.1</version>
         <configuration>
           <filesets>
             <fileset>
         <artifactId>maven-clean-plugin</artifactId>
         <version>2.6.1</version>
         <configuration>
           <filesets>
             <fileset>

-              <directory>${basedir}</directory>             
+              <directory>${basedir}</directory>

               <followSymlinks>false</followSymlinks>
               <includes>
                 <include>${linux.64.dir}</include>
               <followSymlinks>false</followSymlinks>
               <includes>
                 <include>${linux.64.dir}</include>


@@ -117,6 +98,19 @@
                   <goal>run</goal>
                 </goals>
               </execution>
                   <goal>run</goal>
                 </goals>
               </execution>

+              <execution>
+                <id>setPropertiesWithoutJRE</id>
+                <phase>clean</phase>
+                <configuration>
+                  <target>
+                    <copy overwrite="true" force="true"
+                      file="${basedir}/build.properties.wo.jre" tofile="${basedir}/build.properties" />
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>

             </executions>
           </plugin>
         </plugins>
             </executions>
           </plugin>
         </plugins>

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 98156cf6b87c49ca2c60dbedb134b465c8d2ad4d..7e7c37700a9c474dba61f32ab81da860938ebbe4 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -46,27 +46,6 @@
           </products>
         </configuration>
       </plugin>
           </products>
         </configuration>
       </plugin>

-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <id>setProductWithoutJRE</id>
-            <phase>validate</phase>
-            <configuration>
-              <target>
-                <copy overwrite="true" force="true"
-                  file="${basedir}/eu.etaxonomy.taxeditor.product.wo.jre"
-                  tofile="${basedir}/eu.etaxonomy.taxeditor.product" />
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>

     </plugins>
   </build>
   <profiles>
     </plugins>
   </build>
   <profiles>


@@ -178,6 +157,20 @@
                   <goal>run</goal>
                 </goals>
               </execution>
                   <goal>run</goal>
                 </goals>
               </execution>

+              <execution>
+                <id>setProductWithoutJRE</id>
+                <phase>clean</phase>
+                <configuration>
+                  <target>
+                    <copy overwrite="true" force="true"
+                      file="${basedir}/eu.etaxonomy.taxeditor.product.wo.jre"
+                      tofile="${basedir}/eu.etaxonomy.taxeditor.product" />
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>

             </executions>
           </plugin>
         </plugins>
             </executions>
           </plugin>
         </plugins>