fix #7334 update script for pro parte synonyms to concept relationships

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

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index bf453b28baea94ff08ea9cbf01f066b86beb45bb..4e2030ec72ad5b49e162910347ad67e93c8d3ba3 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-               <version>4.2.0</version>
+    <version>4.15.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -11,11 +11,7 @@
   <artifactId>cdmlib-persistence</artifactId>
   <name>CDM Persistence</name>
   <description>EDIT CDM library persistence layer. Mainly DAOs</description>
-  <scm>
-    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-persistence/</connection>
-    <developerConnection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-persistence/</developerConnection>
-    <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-persistence/</url>
-  </scm>
+
   <build>
     <plugins>
       <plugin>
@@ -38,9 +34,9 @@
         </configuration>
         <dependencies>
           <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>${hsqldb.version}</version>
+            <groupId>eu.etaxonomy</groupId>
+            <artifactId>cdmlib-db</artifactId>
+            <version>${project.version}</version>
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
@@ -70,14 +66,9 @@
         </configuration>
          <dependencies>
           <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>${hsqldb.version}</version>
-          </dependency>
-          <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-                       <version>${mysql.version}</version>
+            <groupId>eu.etaxonomy</groupId>
+            <artifactId>cdmlib-db</artifactId>
+            <version>${project.version}</version>
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
@@ -165,12 +156,14 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-c3p0</artifactId>
+      <!-- only needed as long as hibernate-c3p0 is still dependend on c3p0/c3p0/0.9.1 -->
+      <exclusions>
+        <exclusion>
+            <groupId>com.mchange</groupId>
+            <artifactId>c3p0</artifactId>  
+        </exclusion>
+      </exclusions>
     </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>
-       </dependency>
     <!-- Since hibernate 5.0.4 the logging for a Dialect throws ClassDefNotFound for javax.transaction.SystemException if jta is missing  -->
     <dependency>
       <groupId>javax.transaction</groupId>
@@ -247,33 +240,16 @@
     </dependency>
 
     <!-- ******* DATABASES DRIVER ******* -->
+      <!-- 
+            IMPORTANT:
+            Any driver dependency listed here must be excluded from the 
+            cdmlib-remote depedency in cdmlib-remote-webapp
+      -->
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
+        <groupId>eu.etaxonomy</groupId>
+        <artifactId>cdmlib-db</artifactId>
+        <version>${project.version}</version>
     </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>
-
   
        <!-- Profiling -->
 <!--   <dependency> -->