minor

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

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index ddc0b31d369c3cf927bc3d1a8d3d535f59feb412..ecb5b3b8139b5aafdec47510e2cd8c7a9e31e470 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project xmlns="http://maven.apache.org/POM/4.0.0" \r
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
-  <!-- \r
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"\r
-   -->\r
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>cdmlib-parent</artifactId>\r
-               <version>2.2</version>\r
+               <version>2.4</version>\r
        </parent>\r
        \r
   <modelVersion>4.0.0</modelVersion>\r
@@ -132,6 +130,10 @@
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>cdmlib-model</artifactId>\r
        </dependency>\r
+       <dependency>\r
+               <groupId>eu.etaxonomy</groupId>\r
+               <artifactId>cdmlib-commons</artifactId>\r
+       </dependency>\r
        <dependency>\r
            <groupId>org.slf4j</groupId>\r
         <artifactId>slf4j-log4j12</artifactId>\r
@@ -144,10 +146,6 @@
         <groupId>javassist</groupId>\r
         <artifactId>javassist</artifactId>\r
        </dependency>\r
-       <dependency>\r
-        <groupId>org.springframework</groupId>\r
-        <artifactId>spring-agent</artifactId>\r
-    </dependency>\r
        <dependency>\r
                <groupId>javax.annotation</groupId>\r
                <artifactId>jsr250-api</artifactId>\r
@@ -176,6 +174,10 @@
                <groupId>org.hibernate</groupId>\r
                <artifactId>hibernate-search</artifactId>\r
        </dependency>\r
+       <dependency>\r
+               <groupId>org.hibernate</groupId>\r
+               <artifactId>hibernate-c3p0</artifactId>\r
+       </dependency>\r
        <dependency>\r
                <groupId>org.apache.lucene</groupId>\r
                <artifactId>lucene-core</artifactId>\r
@@ -193,10 +195,15 @@
                      <groupId>commons-lang</groupId>\r
                      <artifactId>commons-lang</artifactId>\r
      </dependency>\r
+     <dependency>\r
+      <groupId>commons-dbcp</groupId>\r
+      <artifactId>commons-dbcp</artifactId>\r
+      <version>1.2.2</version>\r
+    </dependency>\r
        <dependency>\r
-               <groupId>org.springmodules</groupId>\r
-               <artifactId>spring-modules-lucene</artifactId>\r
-       </dependency>\r
+          <groupId>org.springmodules</groupId>\r
+          <artifactId>spring-modules-lucene</artifactId>\r
+    </dependency>\r
     <dependency>\r
         <groupId>org.unitils</groupId>\r
         <artifactId>unitils</artifactId>\r
@@ -207,45 +214,32 @@
     </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
-               <artifactId>spring</artifactId>\r
+               <artifactId>org.springframework.beans</artifactId>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
-               <artifactId>spring-beans</artifactId>\r
+               <artifactId>org.springframework.orm</artifactId>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
-               <artifactId>spring-orm</artifactId>\r
+               <artifactId>org.springframework.jdbc</artifactId>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
-               <artifactId>spring-jdbc</artifactId>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>org.springframework</groupId>\r
-               <artifactId>spring-test</artifactId>\r
+               <artifactId>org.springframework.test</artifactId>\r
        </dependency>\r
     <dependency>\r
                <groupId>org.springframework</groupId>\r
-               <artifactId>spring-aop</artifactId>\r
+               <artifactId>org.springframework.aop</artifactId>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.springframework</groupId>\r
-      <artifactId>spring-aspects</artifactId>\r
+      <artifactId>org.springframework.aspects</artifactId>\r
     </dependency>\r
     <dependency>\r
        <groupId>org.springframework.security</groupId>\r
        <artifactId>spring-security-core</artifactId>\r
-    </dependency>\r
-    <dependency><!-- Required for TestingAuthenticationProvider etc until 2.5.0 [SEC-1010] -->\r
-               <groupId>org.springframework.security</groupId>\r
-       <artifactId>spring-security-core</artifactId>\r
-       <version>2.0.4</version>\r
-               <type>test-jar</type>\r
-               <scope>test</scope>\r
-       </dependency>\r
-       \r
-       \r
+    </dependency>      \r
        <!-- ******* DATABASES DRIVER ******* -->\r
        <dependency>\r
                <groupId>mysql</groupId>\r
@@ -264,9 +258,13 @@
                <groupId>net.sourceforge.jtds</groupId>\r
                <artifactId>jtds</artifactId>\r
        </dependency>\r
-       <dependency>\r
+       <!--<dependency>\r
+               <groupId>com.microsoft.sqlserver</groupId>\r
+               <artifactId>jdbc4</artifactId>\r
+       </dependency>-->\r
+       <dependency>\r
                <groupId>com.microsoft.sqlserver</groupId>\r
-               <artifactId>jdbc</artifactId>\r
+               <artifactId>jdbc4</artifactId>\r
        </dependency>\r
 <!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)\r
        <dependency>\r