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

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index 204affe0ec..028d3b299a 100644
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<groupId>eu.etaxonomy</groupId>
-		<artifactId>cdmlib-parent</artifactId>
-		<version>3.0.7-SNAPSHOT</version>
-		<relativePath>pom.xml</relativePath>
-	</parent>
-	
+  <parent>
+    <groupId>eu.etaxonomy</groupId>
+    <artifactId>cdmlib-parent</artifactId>
+		<version>3.2.3-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-persistence</artifactId>
   <name>CDM Persistence</name>
@@ -40,7 +40,7 @@
           <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.4</version> 
+            <version>${hsqldb.version}</version>
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
@@ -57,14 +57,14 @@
               <classpath refid="maven.plugin.classpath" />
             </taskdef>
             <mkdir dir="target/generated-sources/hibernate3" />
-            <hibernatetool destdir=".">  
+            <hibernatetool destdir=".">
               <classpath>
                 <path refid="maven.plugin.classpath" />
                 <path refid="maven.compile.classpath" />
                 <path refid="maven.test.classpath" />
               </classpath>
-              <jpaconfiguration persistenceunit="cdm" /> 
-              <hbm2ddl drop="false" create="true" export="false" outputfilename="target/generated-sources/hibernate3/001_cdm.ddl" delimiter=";" format="true" />  
+              <jpaconfiguration persistenceunit="cdm" />
+              <hbm2ddl drop="false" create="true" export="false" outputfilename="target/generated-sources/hibernate3/001_cdm.ddl" delimiter=";" format="true" />
               </hibernatetool>
           </tasks>
         </configuration>
@@ -72,43 +72,45 @@
           <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.4</version>
+            <version>${hsqldb.version}</version>
           </dependency>
           <dependency>
-  		    <groupId>mysql</groupId>
-  		    <artifactId>mysql-connector-java</artifactId>
-            <version>5.0.5</version>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.24</version>
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
+            <version>${hibernate.version}</version>
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
+            <version>${hibernate.version}</version>
           </dependency>
           <dependency>
+          	<!-- is this still needed ?? -->
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-tools</artifactId>
-            <version>3.2.3.GA</version>
+            <version>3.2.4.GA</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.2</version>
+            <version>1.7.2</version>
           </dependency>
           <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-              <version>1.1.1</version>
+              <version>1.1.2</version>
           </dependency>
         </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.2</version>
         <executions>
           <execution>
             <goals>
@@ -120,166 +122,226 @@
     </plugins>
   </build>
   <dependencies>
-  	 <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>
+     <dependency>
+		<groupId>org.hibernate.javax.persistence</groupId>
+    	<artifactId>hibernate-jpa-2.0-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>
     </dependency>
-  	<dependency>
-  		<groupId>javax.persistence</groupId>
-  		<artifactId>persistence-api</artifactId>
-  	</dependency>
-  	<dependency>
-        <groupId>javassist</groupId>
+    <dependency>
+        <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>javax.annotation</groupId>
-  		<artifactId>jsr250-api</artifactId>
-  	</dependency>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
     </dependency>
-  	<dependency>
-  		<groupId>org.hibernate</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>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.hibernate</groupId>
-  		<artifactId>hibernate-search</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.hibernate</groupId>
-  		<artifactId>hibernate-c3p0</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.apache.lucene</groupId>
-  		<artifactId>lucene-core</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.apache.lucene</groupId>
-  		<artifactId>lucene-spellchecker</artifactId>
-  	</dependency>
-  	<dependency>
+    <dependency>
+      <groupId>org.hibernate.common</groupId>
+      <artifactId>hibernate-commons-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-search</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <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>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-spellchecker</artifactId>
+    </dependency>
+    <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.7.0</version>
-     </dependency> 
+     </dependency>
      <dependency>
-		      <groupId>commons-lang</groupId>
-		      <artifactId>commons-lang</artifactId>
+          <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>
-        <artifactId>unitils</artifactId>
+        <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>
+      <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>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.orm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.jdbc</artifactId>
     </dependency>
-  	<dependency>
-  		<groupId>org.springframework</groupId>
-  		<artifactId>org.springframework.beans</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.springframework</groupId>
-  		<artifactId>org.springframework.orm</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.springframework</groupId>
-  		<artifactId>org.springframework.jdbc</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.springframework</groupId>
-  		<artifactId>org.springframework.test</artifactId>
-  	</dependency>
-    <dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>org.springframework.aop</artifactId>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.test</artifactId>
+    </dependency>
+    <dependency>
+    <groupId>org.springframework</groupId>
+    <artifactId>org.springframework.aop</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>org.springframework.aspects</artifactId>
     </dependency>
     <dependency>
-    	<groupId>org.springframework.security</groupId>
-    	<artifactId>spring-security-core</artifactId>
-    </dependency> 	
-  	<!-- ******* DATABASES DRIVER ******* -->
-  	<dependency>
-  		<groupId>mysql</groupId>
-  		<artifactId>mysql-connector-java</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>postgresql</groupId>
-  		<artifactId>postgresql</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>hsqldb</groupId>
-  		<artifactId>hsqldb</artifactId>
-  	</dependency>
-  	<!-- SQL Server and Sybase -->
-  	<dependency>
-  		<groupId>net.sourceforge.jtds</groupId>
-  		<artifactId>jtds</artifactId>
-  	</dependency>
-  	<!--<dependency>
-  		<groupId>com.microsoft.sqlserver</groupId>
-  		<artifactId>jdbc4</artifactId>
-  	</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>
+
+    <!-- ******* DATABASES DRIVER ******* -->
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+    </dependency>
+    <!-- SQL Server and Sybase -->
+    <dependency>
+      <groupId>net.sourceforge.jtds</groupId>
+      <artifactId>jtds</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>jdbc4</artifactId>
+    </dependency>
+
+    <dependency>
+    <groupId>com.h2database</groupId>
+    <artifactId>h2</artifactId>
+    </dependency>
+
+    <!--  SQL Debugging  -->
+    <dependency>
+        <groupId>p6spy</groupId>
+        <artifactId>p6spy</artifactId>
+    </dependency>
+  
+	<!-- Profiling -->
 	<dependency>
-  		<groupId>com.microsoft.sqlserver</groupId>
-  		<artifactId>jdbc4</artifactId>
-  	</dependency>
-<!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)
-  	<dependency>
-  		<groupId>com.microsoft.jdbcdriver</groupId>
-  		<artifactId>mssqlserver</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>com.microsoft.jdbcdriver</groupId>
-  		<artifactId>msutil</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>com.microsoft.jdbcdriver</groupId>
-  		<artifactId>msbase</artifactId>
-  	</dependency>
--->
-  	<dependency>
-		<groupId>com.h2database</groupId>
-		<artifactId>h2</artifactId>
-  	</dependency>
-	
-  	
+		<groupId>com.yourkit</groupId>
+		<artifactId>yjp-controller-api-redist</artifactId>
+		<scope>test</scope>
+	</dependency>
   </dependencies>
   
 </project>