cleanup

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

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 8bee2dba6ec559fd18579b47dd715bcb2b7f492d..ef25837b1066aa8ddd10ec7f379f3765c033b05b 100644 (file)
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.26.0</version>
+    <version>5.40.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -25,7 +25,8 @@
     <plugins>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
+               <!-- TODO upgrading to 3.2.0 shows an exception, needs further research -->
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>copy-resources</id>
@@ -50,14 +51,13 @@
   
   <dependencies>
     <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-io</artifactId>
+       <groupId>eu.etaxonomy</groupId>
+       <artifactId>cdmlib-test</artifactId>
+       <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>eu.etaxonomy</groupId>
-        <artifactId>cdmlib-test</artifactId>
-        <scope>test</scope>
-        <version>${project.version}</version>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-io</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -89,6 +89,14 @@
           <groupId>org.springframework</groupId>
           <artifactId>spring-mock</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -128,11 +136,6 @@
         <groupId>com.github.dozermapper</groupId>
         <artifactId>dozer-spring4</artifactId>
     </dependency>
-    <dependency>
-      <groupId>net.sf.json-lib</groupId>
-      <artifactId>json-lib</artifactId>
-      <classifier>jdk15</classifier>
-    </dependency>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
@@ -155,23 +158,23 @@
         </exclusion>
       </exclusions>
     </dependency>
-    
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
-    </dependency>
 
     <!-- JsonView -->
     <dependency>
       <!-- for xml serialization (net.sf.json.xml.XMLSerializer) -->
       <groupId>xom</groupId>
       <artifactId>xom</artifactId>
-<!--       <exclusions> -->
+      <exclusions>
+        <exclusion>
+          <!-- has overlap with jakarta-regexp -->
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
+        </exclusion>
 <!--         <exclusion> -->
 <!--           <groupId>xml-apis</groupId> -->
 <!--           <artifactId>xml-apis</artifactId> -->
 <!--         </exclusion> -->
-<!--       </exclusions> -->
+      </exclusions>
     </dependency>
 
     <!-- swagger -->
@@ -185,11 +188,19 @@
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-c3p0</artifactId>
     </dependency>
+    
     <!-- iif -->
     <dependency>
       <groupId>de.digitalcollections.iiif</groupId>
       <artifactId>iiif-apis</artifactId>
     </dependency>
+    
+    <!-- needed only until problems in LoggingConfigurator are solved -->
+<!--    <dependency>-->
+<!--      <groupId>log4j</groupId>-->
+<!--      <artifactId>log4j</artifactId>-->
+<!--    </dependency>-->
+    
   </dependencies>
 </project>