fix #804 implemeting required test - executes successfuly

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

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index 485f3e85b500a7f236f4578dbdacbd5c295c1fe9..e4d1f36120ec38a7b04bee86fcd6d219a0b08e17 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.17.0-SNAPSHOT</version>
+    <version>5.29.0-SNAPSHOT</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,18 +133,14 @@
       <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>
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
     <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-test</artifactId>
@@ -171,30 +167,23 @@
 
     <!-- XmlView -->
     <dependency>
+      <!-- this is also offered by cdmlib-remote. Can it be removed? -->
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
+      <exclusions>
+        <!-- https://stackoverflow.com/questions/17077922/maven-xpp3-versus-xpp3-min -->
+        <!-- But maybe we can exclude xpp3 instead, not sure if it is directly needed or only for xstream -->
+        <exclusion>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3_min</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>xpp3</groupId>
       <artifactId>xpp3</artifactId>
     </dependency>
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax</artifactId>
-    </dependency>
 
-    <!-- JSP TAG LIBS -->
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>x</artifactId>
-      <version>1.1.2</version>
-      <type>tld</type>
-    </dependency>
     <!-- swagger -->
     <dependency>
       <groupId>io.springfox</groupId>
@@ -268,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>
@@ -370,13 +332,6 @@
             </goals>
           </execution>
         </executions>
-        <dependencies>
-            <dependency>
-                    <groupId>org.apache.taglibs</groupId>
-                    <artifactId>taglibs-standard-impl</artifactId>
-                    <version>1.2.5</version>
-            </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -397,7 +352,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
+        <version>3.2.0</version>
         <configuration>
           <escapeWindowsPaths>false</escapeWindowsPaths>
         </configuration>