X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/beb43d93f2b3feef25ad6ddf931db15779202a9f..05109aeb4d2caabb4b8753f0c0f25a4ec153de8c:/cdmlib-persistence/pom.xml

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index ddc0b31d36..ecb5b3b813 100644
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -1,13 +1,11 @@
 <?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"
-   -->
+  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>2.2</version>
+		<version>2.4</version>
 	</parent>
 	
   <modelVersion>4.0.0</modelVersion>
@@ -132,6 +130,10 @@
   		<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>
@@ -144,10 +146,6 @@
         <groupId>javassist</groupId>
         <artifactId>javassist</artifactId>
   	</dependency>
-  	<dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-agent</artifactId>
-    </dependency>
   	<dependency>
   		<groupId>javax.annotation</groupId>
   		<artifactId>jsr250-api</artifactId>
@@ -176,6 +174,10 @@
   		<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>
@@ -193,10 +195,15 @@
 		      <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>
-  	</dependency>
+	   <groupId>org.springmodules</groupId>
+	   <artifactId>spring-modules-lucene</artifactId>
+    </dependency>
     <dependency>
         <groupId>org.unitils</groupId>
         <artifactId>unitils</artifactId>
@@ -207,45 +214,32 @@
     </dependency>
   	<dependency>
   		<groupId>org.springframework</groupId>
-  		<artifactId>spring</artifactId>
+  		<artifactId>org.springframework.beans</artifactId>
   	</dependency>
   	<dependency>
   		<groupId>org.springframework</groupId>
-  		<artifactId>spring-beans</artifactId>
+  		<artifactId>org.springframework.orm</artifactId>
   	</dependency>
   	<dependency>
   		<groupId>org.springframework</groupId>
-  		<artifactId>spring-orm</artifactId>
+  		<artifactId>org.springframework.jdbc</artifactId>
   	</dependency>
   	<dependency>
   		<groupId>org.springframework</groupId>
-  		<artifactId>spring-jdbc</artifactId>
-  	</dependency>
-  	<dependency>
-  		<groupId>org.springframework</groupId>
-  		<artifactId>spring-test</artifactId>
+  		<artifactId>org.springframework.test</artifactId>
   	</dependency>
     <dependency>
 		<groupId>org.springframework</groupId>
-		<artifactId>spring-aop</artifactId>
+		<artifactId>org.springframework.aop</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-aspects</artifactId>
+      <artifactId>org.springframework.aspects</artifactId>
     </dependency>
     <dependency>
     	<groupId>org.springframework.security</groupId>
     	<artifactId>spring-security-core</artifactId>
-    </dependency>
-    <dependency><!-- Required for TestingAuthenticationProvider etc until 2.5.0 [SEC-1010] -->
-  		<groupId>org.springframework.security</groupId>
-    	<artifactId>spring-security-core</artifactId>
-    	<version>2.0.4</version>
-  		<type>test-jar</type>
-  		<scope>test</scope>
-  	</dependency>
-  	
-  	
+    </dependency> 	
   	<!-- ******* DATABASES DRIVER ******* -->
   	<dependency>
   		<groupId>mysql</groupId>
@@ -264,9 +258,13 @@
   		<groupId>net.sourceforge.jtds</groupId>
   		<artifactId>jtds</artifactId>
   	</dependency>
-  	<dependency>
+  	<!--<dependency>
+  		<groupId>com.microsoft.sqlserver</groupId>
+  		<artifactId>jdbc4</artifactId>
+  	</dependency>-->
+	<dependency>
   		<groupId>com.microsoft.sqlserver</groupId>
-  		<artifactId>jdbc</artifactId>
+  		<artifactId>jdbc4</artifactId>
   	</dependency>
 <!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)
   	<dependency>