integrating trunk to hibernate4 branch. Probably no real changes.

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

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index 0965e98822f1216e4ffb772e0300256930517cd2..8fa4ded221aceb37d28b149598ea5504fc9ad092 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -121,6 +121,10 @@
     </plugins>
   </build>
   <dependencies>
+     <dependency>
+               <groupId>org.hibernate.javax.persistence</groupId>
+       <artifactId>hibernate-jpa-2.0-api</artifactId>
+        </dependency>
      <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-model</artifactId>
@@ -133,10 +137,6 @@
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.persistence</groupId>
-      <artifactId>persistence-api</artifactId>
-    </dependency>
     <dependency>
         <groupId>javassist</groupId>
         <artifactId>javassist</artifactId>
@@ -150,29 +150,32 @@
       <artifactId>aspectjweaver</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.common</groupId>
       <artifactId>hibernate-commons-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-annotations</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-envers</artifactId>
+      <artifactId>hibernate-search</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-search</artifactId>
+      <artifactId>hibernate-envers</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-c3p0</artifactId>
     </dependency>
+        <!-- only needed as long as hibernate-c3p0 is still dependend on c3p0/c3p0/0.9.1 -->
+        <dependency>
+                               <groupId>com.mchange</groupId>
+                               <artifactId>c3p0</artifactId>
+                               <version>0.9.2</version>
+                       </dependency>
+    
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
@@ -184,20 +187,16 @@
     <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.7.0</version>
+        <version>1.8.2</version>
      </dependency>
      <dependency>
           <groupId>commons-lang</groupId>
           <artifactId>commons-lang</artifactId>
      </dependency>
      <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.2.2</version>
-    </dependency>
-    <dependency>
-     <groupId>org.springmodules</groupId>
-     <artifactId>spring-modules-lucene</artifactId>
+             <groupId>commons-dbcp</groupId>
+             <artifactId>commons-dbcp</artifactId>
+<!--         <scope>test</scope> , currently also used in NomenclaturalCodeAwareDataSource and maybe others -->
     </dependency>
     <dependency>
         <groupId>org.unitils</groupId>
@@ -238,6 +237,12 @@
       <groupId>org.unitils</groupId>
       <artifactId>unitils-orm</artifactId>
       <scope>test</scope>
+      <exclusions>
+       <exclusion>
+               <groupId>javax.persistence</groupId>
+               <artifactId>persistence-api</artifactId>
+       </exclusion>
+      </exclusions>
     </dependency>
      <dependency>
       <groupId>org.unitils</groupId>
@@ -286,6 +291,10 @@
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
     </dependency>
+<!--     <dependency>
+     <groupId>org.springmodules</groupId>
+     <artifactId>spring-modules-lucene</artifactId>
+    </dependency> -->
     <!-- ******* DATABASES DRIVER ******* -->
     <dependency>
       <groupId>mysql</groupId>