integrating trunk to hibernate4 branch. Probably no real changes.

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

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index a18c5671a5b7365c119c98dbc15a58de67f5e66a..059a95fd662d9238f50bdaa6dde599a8011c310d 100644 (file)
--- a/cdmlib-ext/pom.xml
+++ b/cdmlib-ext/pom.xml
@@ -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>
@@ -70,6 +77,12 @@
      <dependency>
       <groupId>org.unitils</groupId>
       <artifactId>unitils-orm</artifactId>
+      <exclusions>
+       <exclusion>
+               <groupId>javax.persistence</groupId>
+               <artifactId>persistence-api</artifactId>
+       </exclusion>
+      </exclusions>
       <scope>test</scope>
     </dependency>
      <dependency>