X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/dcea69e6434b984953da01c48e83d4265bcb6f04..2307cae7cb0c4f11aab932c07e363e2554242e49:/cdmlib-persistence/pom.xml

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index 27fd98ef92..f4f347b4ec 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.0.13-SNAPSHOT</version>
+		<version>3.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -75,40 +75,42 @@
             <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,6 +122,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,11 +139,7 @@
         <artifactId>slf4j-log4j12</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.persistence</groupId>
-      <artifactId>persistence-api</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>javassist</groupId>
+        <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
     </dependency>
     <dependency>
@@ -149,29 +151,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>
@@ -183,20 +188,15 @@
     <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.7.0</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>
@@ -237,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>
@@ -248,6 +254,11 @@
       <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>
@@ -257,6 +268,10 @@
       <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>
@@ -281,6 +296,12 @@
       <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>
@@ -299,28 +320,11 @@
       <groupId>net.sourceforge.jtds</groupId>
       <artifactId>jtds</artifactId>
     </dependency>
-    <!--<dependency>
-      <groupId>com.microsoft.sqlserver</groupId>
-      <artifactId>jdbc4</artifactId>
-    </dependency>-->
-  <dependency>
+    <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>
@@ -331,6 +335,13 @@
         <groupId>p6spy</groupId>
         <artifactId>p6spy</artifactId>
     </dependency>
+  
+	<!-- Profiling -->
+	<dependency>
+		<groupId>com.yourkit</groupId>
+		<artifactId>yjp-controller-api-redist</artifactId>
+		<scope>test</scope>
+	</dependency>
   </dependencies>
-
+  
 </project>