updating develop poms to master versions to avoid merge conflicts

[cdmlib.git] / cdmlib-remote-webapp / pom.xml

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index e21c66cc339c594b9995902646f5bc523e158047..afb0d2c5e63a87d5d65348b636d327814b6eb013 100755 (executable)
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.26.0-SNAPSHOT</version>
+    <version>5.31.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>cdmlib-remote-webapp</artifactId>
@@ -61,7 +61,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.16</version>
+            <version>2.22.2</version>
             <configuration>
               <forkCount>3</forkCount>
               <reuseForks>true</reuseForks>
@@ -101,7 +101,7 @@
         <plugins>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.16</version>
+            <version>2.22.2</version>
             <configuration>
               <forkCount>3</forkCount>
               <reuseForks>true</reuseForks>
@@ -133,8 +133,8 @@
       <artifactId>cdmlib-remote</artifactId>
       <exclusions>
         <!-- exclude all jdbc drivers from the war. Jdbc drivers must only 
-          be added to {APPLICATION_CONTAINER}/lib see http://dev.e-taxonomy.eu/trac/ticket/4955 
-          and http://stackoverflow.com/questions/6981564/why-must-the-jdbc-driver-be-put-in-tomcat-home-lib-folder -->
+          be added to {APPLICATION_CONTAINER}/lib see https://dev.e-taxonomy.eu/redmine/issues/4955 
+          and https://stackoverflow.com/questions/6981564/why-must-the-jdbc-driver-be-put-in-tomcat-home-lib-folder -->
         <exclusion>
           <groupId>eu.etaxonomy</groupId>
           <artifactId>cdmlib-db</artifactId>
@@ -257,33 +257,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.16</version>
-        <!-- configuration per maven profile -->
-        
-<!--         <configuration> -->
-<!--           <forkCount>3</forkCount> -->
-<!--           <reuseForks>true</reuseForks> -->
-<!--         </configuration> -->
-<!--         <executions> -->
-<!--           <execution> -->
-<!--             <id>default</id> -->
-<!--             <goals> -->
-<!--               <goal>integration-test</goal> -->
-<!--               <goal>verify</goal> -->
-<!--             </goals> -->
-<!--             <configuration> -->
-<!--               <systemPropertyVariables> -->
-<!--                 <cdm.datasource>h2_cdmTest</cdm.datasource> -->
-<!--               </systemPropertyVariables> -->
-<!--               <excludes> -->
-<!--                 <exclude>**/ForceSchemaCreateIT.java</exclude> -->
-<!--               </excludes> -->
-<!--             </configuration> -->
-<!--           </execution> -->
-<!--         </executions> -->
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
@@ -363,7 +336,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.6</version>
+        <version>3.3.2</version>
         <executions>
           <execution>
             <!-- The war must be created after running the integration-tests, 
@@ -379,7 +352,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
+        <version>3.2.0</version>
         <configuration>
           <escapeWindowsPaths>false</escapeWindowsPaths>
         </configuration>