X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/e9039a5e9233e0e1bd75b2e829ddb60620016ceb..c4db95cb579afa0532b409361201c04475e356dd:/cdmlib-persistence/pom.xml

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index caff038c2f..a75ab1058e 100644
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-		<version>3.11.0</version>
+		<version>4.0.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -21,12 +21,12 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>hibernate3-maven-plugin</artifactId>
-        <version>2.1</version>
+        <version>3.0</version>
         <configuration>
           <components>
             <component>
               <name>hbm2ddl</name>
-              <implementation>annotationconfiguration</implementation>
+              <implementation>annotationconfigurationX</implementation>
             </component>
           </components>
           <componentProperties>
@@ -38,14 +38,14 @@
         </configuration>
         <dependencies>
           <dependency>
-            <groupId>hsqldb</groupId>
+            <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
             <version>${hsqldb.version}</version>
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-annotations</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
+            <version>3.5.6-FINAL</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -68,16 +68,16 @@
               </hibernatetool>
           </tasks>
         </configuration>
-        <dependencies>
+         <dependencies>
           <dependency>
-            <groupId>hsqldb</groupId>
+            <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
             <version>${hsqldb.version}</version>
           </dependency>
           <dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.24</version>
+			<version>${mysql.version}</version>
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
@@ -98,12 +98,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.2</version>
+            <version>${slf4j.version}</version>
           </dependency>
           <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-              <version>1.1.2</version>
+              <version>${commons-logging.version}</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -123,17 +123,13 @@
   </build>
   <dependencies>
      <dependency>
-		<groupId>org.hibernate.javax.persistence</groupId>
-    	<artifactId>hibernate-jpa-2.0-api</artifactId>
-	 </dependency>
+       <groupId>org.hibernate.javax.persistence</groupId>
+       <artifactId>hibernate-jpa-2.1-api</artifactId>
+     </dependency>
      <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-model</artifactId>
     </dependency>
-  <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-commons</artifactId>
-    </dependency>
     <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
@@ -160,7 +156,7 @@
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-search</artifactId>
+      <artifactId>hibernate-search-orm</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
@@ -174,24 +170,31 @@
    	<dependency>
 		<groupId>com.mchange</groupId>
 		<artifactId>c3p0</artifactId>
-		<version>0.9.2</version>
 	</dependency>
-    
+    <!-- Since hibernate 5.0.4 the logging for a Dialect throws ClassDefNotFound for javax.transaction.SystemException if jta is missing  -->
     <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
+      <groupId>javax.transaction</groupId>
+      <artifactId>jta</artifactId>
+    </dependency>  
+    <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-spellchecker</artifactId>
+      <artifactId>lucene-suggest</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-queryparser</artifactId>
     </dependency>
     <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
      </dependency>
      <dependency>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
      </dependency>
      <dependency>
 	      <groupId>commons-dbcp</groupId>
@@ -203,104 +206,106 @@
         <artifactId>unitils-core</artifactId>
         <!-- <scope>test</scope> unscoped since we need this dependency at compile time for H2DbSupport.java -->
     </dependency>
+    
     <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-database</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-dbmaintainer</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-dbunit</artifactId>
-      <scope>test</scope>
-    </dependency>
-     <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-easymock</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-mock</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.unitils</groupId>
-      <artifactId>unitils-inject</artifactId>
-      <scope>test</scope>
-    </dependency>
-     <dependency>
-      <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>
-      <artifactId>unitils-spring</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.dbunit</groupId>
-      <artifactId>dbunit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-    <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.carrotsearch</groupId>
-      <artifactId>junit-benchmarks</artifactId>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-test</artifactId>
       <scope>test</scope>
     </dependency>
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-database</artifactId> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-dbmaintainer</artifactId> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-dbunit</artifactId> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--      <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-easymock</artifactId> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-mock</artifactId> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.unitils</groupId> -->
+<!--       <artifactId>unitils-inject</artifactId> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--      <dependency> -->
+<!--       <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> -->
+<!--       <artifactId>unitils-spring</artifactId> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>org.dbunit</groupId> -->
+<!--       <artifactId>dbunit</artifactId> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>xmlunit</groupId> -->
+<!--       <artifactId>xmlunit</artifactId> -->
+<!--     <scope>test</scope> -->
+<!--     </dependency> -->
+<!--     <dependency> -->
+<!--       <groupId>com.carrotsearch</groupId> -->
+<!--       <artifactId>junit-benchmarks</artifactId> -->
+<!--       <scope>test</scope> -->
+<!--     </dependency> -->
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.beans</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.expression</artifactId>
+      <artifactId>spring-beans</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.orm</artifactId>
+      <artifactId>spring-expression</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.jdbc</artifactId>
+      <artifactId>spring-orm</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.test</artifactId>
+      <artifactId>spring-jdbc</artifactId>
     </dependency>
     <dependency>
-    <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.aop</artifactId>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.aspects</artifactId>
+      <artifactId>spring-aspects</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
     </dependency>
-	  <!-- required by Xerces 2.11.0 -->
-	  <dependency>
-		<groupId>org.apache.xmlgraphics</groupId>
-		<artifactId>batik-ext</artifactId>
-	  </dependency>
+    <!-- required by Xerces 2.11.0 -->
+    <dependency>
+	   <groupId>org.apache.xmlgraphics</groupId>
+	   <artifactId>batik-ext</artifactId>
+    </dependency>
 
     <!-- ******* DATABASES DRIVER ******* -->
     <dependency>
@@ -308,11 +313,11 @@
       <artifactId>mysql-connector-java</artifactId>
     </dependency>
     <dependency>
-      <groupId>postgresql</groupId>
+      <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
     </dependency>
     <dependency>
-      <groupId>hsqldb</groupId>
+      <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
     </dependency>
     <!-- SQL Server and Sybase -->
@@ -326,22 +331,17 @@
     </dependency>
 
     <dependency>
-    <groupId>com.h2database</groupId>
-    <artifactId>h2</artifactId>
+        <groupId>com.h2database</groupId>
+        <artifactId>h2</artifactId>
     </dependency>
 
-    <!--  SQL Debugging  -->
-    <dependency>
-        <groupId>p6spy</groupId>
-        <artifactId>p6spy</artifactId>
-    </dependency>
   
 	<!-- Profiling -->
-	<dependency>
-		<groupId>com.yourkit</groupId>
-		<artifactId>yjp-controller-api-redist</artifactId>
-		<scope>test</scope>
-	</dependency>
+<!-- 	<dependency> -->
+<!-- 		<groupId>com.yourkit</groupId> -->
+<!-- 		<artifactId>yjp-controller-api-redist</artifactId> -->
+<!-- 		<scope>test</scope> -->
+<!-- 	</dependency> -->
   </dependencies>
   
 </project>