X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/c92d46efc84a5ee5e73ccb4555669d60ca79e52a..81b11e62164b2b80fcad1bd4dc07c920d963d7b3:/cdmlib-persistence/pom.xml

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index 8e252bde2c..c7c27913cc 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>5.18.0-SNAPSHOT</version>
+    <version>5.22.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -15,93 +15,10 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>hibernate3-maven-plugin</artifactId>
-        <version>3.0</version>
-        <configuration>
-          <components>
-            <component>
-              <name>hbm2ddl</name>
-              <implementation>annotationconfigurationX</implementation>
-            </component>
-          </components>
-          <componentProperties>
-            <namingstrategy>org.hibernate.cfg.DefaultComponentSafeNamingStrategy</namingstrategy>
-            <propertyfile>/src/test/resources/dbscripts/hibernate.properties</propertyfile>
-            <outputfilename>001_cdm.ddl</outputfilename>
-            <configurationfile>/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml</configurationfile>
-          </componentProperties>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>eu.etaxonomy</groupId>
-            <artifactId>cdmlib-db</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-annotations</artifactId>
-            <version>3.5.6-FINAL</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <configuration>
-          <tasks>
-            <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.EnversHibernateToolTask">
-              <classpath refid="maven.plugin.classpath" />
-            </taskdef>
-            <mkdir dir="target/generated-sources/hibernate3" />
-            <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" />
-              </hibernatetool>
-          </tasks>
-        </configuration>
-         <dependencies>
-          <dependency>
-            <groupId>eu.etaxonomy</groupId>
-            <artifactId>cdmlib-db</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-envers</artifactId>
-            <version>${hibernate.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <version>${hibernate.version}</version>
-          </dependency>
-          <dependency>
-          	<!-- is this still needed ?? -->
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-tools</artifactId>
-            <version>3.2.4.GA</version>
-          </dependency>
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-              <version>${commons-logging.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
+        <!-- TODO do we need this? At all or move it in cdmlib-test? -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <goals>
@@ -121,22 +38,10 @@
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-model</artifactId>
     </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
     <dependency>
         <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aspectj</groupId>
-      <artifactId>aspectjweaver</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.hibernate.common</groupId>
       <artifactId>hibernate-commons-annotations</artifactId>
@@ -164,11 +69,12 @@
         </exclusion>
       </exclusions>
     </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>
-      <artifactId>jta</artifactId>
-    </dependency>  
+<!--     <dependency> -->
+<!--       Since hibernate 5.0.4 the logging for a Dialect throws ClassDefNotFound for javax.transaction.SystemException if jta is missing  -->
+<!--       Update: since geronimo-jta (dependency of hibernate-core is on the classpath this should not be an issue anymore 
+            <groupId>javax.transaction</groupId> -->
+<!--       <artifactId>jta</artifactId> -->
+<!--     </dependency>   -->
     <dependency>
         <groupId>org.apache.lucene</groupId>
         <artifactId>lucene-core</artifactId>
@@ -184,15 +90,11 @@
     <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-     </dependency>
-     <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-     </dependency>
-     <dependency>
-	      <groupId>commons-dbcp</groupId>
-	      <artifactId>commons-dbcp</artifactId>
-<!-- 	      <scope>test</scope> , currently also used in NomenclaturalCodeAwareDataSource and maybe others -->
+    </dependency>
+    <dependency>
+        <!-- used for class LocalH2 (base class is from commons-dbcp) -->
+        <groupId>commons-dbcp</groupId>
+        <artifactId>commons-dbcp</artifactId>
     </dependency>
     <dependency>
         <groupId>org.unitils</groupId>
@@ -233,11 +135,6 @@
       <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 ******* -->
       <!-- 
@@ -258,5 +155,4 @@
 <!-- 		<scope>test</scope> -->
 <!-- 	</dependency> -->
   </dependencies>
-  
 </project>