merge-update from trunk

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

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 84174f09186df6c3ba5d07d3a67cfaac2655db6c..3aab66aac79670497f8b1eb191c56621ad5dc2bf 100644 (file)
--- a/cdmlib-ext/pom.xml
+++ b/cdmlib-ext/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>cdmlib-parent</artifactId>
-           <version>3.1.3-SNAPSHOT</version>
+           <version>3.4.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -37,9 +37,16 @@
       <artifactId>unitils-core</artifactId>
       <scope>test</scope>
     </dependency>
+<!--     probably most unitis dependencies can be deleted from here -->
     <dependency>
       <groupId>org.unitils</groupId>
       <artifactId>unitils-database</artifactId>
+      <exclusions>
+       <exclusion>
+               <groupId>commons-dbcp</groupId>
+               <artifactId>commons-dbcp</artifactId>
+       </exclusion>
+      </exclusions>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -66,11 +73,6 @@
       <groupId>org.unitils</groupId>
       <artifactId>unitils-inject</artifactId>
       <scope>test</scope>
-    </dependency>
-     <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-orm</artifactId>
-      <scope>test</scope>
     </dependency>
      <dependency>
       <groupId>org.unitils</groupId>
@@ -80,7 +82,7 @@
     <dependency>
       <groupId>org.dbunit</groupId>
       <artifactId>dbunit</artifactId>
-    </dependency>
+    </dependency> 
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
@@ -90,6 +92,15 @@
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
        </dependency>
+       <dependency>
+        <groupId>net.sf.json-lib</groupId>
+                <artifactId>json-lib</artifactId>
+                               <classifier>jdk15</classifier>
+    </dependency>
+       <dependency>
+        <groupId>net.sf.ezmorph</groupId>
+        <artifactId>ezmorph</artifactId>
+    </dependency>
 
   </dependencies>
 </project>