X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/f37ac3923697b1c42130eea88f9633c62ca898f7..18e9150064674c78848babb3880b3db274961aa1:/cdmlib-persistence/pom.xml

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index 4c79160988..7181e27bdf 100644
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>eu.etaxonomy</groupId>
 		<artifactId>cdmlib-parent</artifactId>
-		<version>2.0</version>
+		<version>2.1</version>
 	</parent>
 	
   <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
   </scm>
   <build>
     <plugins>
-    <plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>hibernate3-maven-plugin</artifactId>
         <version>2.1</version>
@@ -36,22 +36,95 @@
             <namingstrategy>org.hibernate.cfg.DefaultComponentSafeNamingStrategy</namingstrategy>
             <propertyfile>/src/test/resources/dbscripts/hibernate.properties</propertyfile>
             <outputfilename>001_cdm.ddl</outputfilename>
-            <configurationfile>/src/test/resources/dbscripts/hibernate.cfg.xml</configurationfile> <!-- Should use common system file, but I don't want to mess with your hibernate setup at the moment -->
+            <configurationfile>/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml</configurationfile>
           </componentProperties>
         </configuration>
         <dependencies>
           <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.4</version> <!-- This should be externalized = ${hsqldb.version} -->
+            <version>1.8.0.4</version> 
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-annotations</artifactId>
-            <version>3.3.1.GA</version> <!-- This should be externalized = ${hibernate.annotations.version}? -->
+            <version>3.4.0-SNAPSHOT</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>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.8.0.4</version>
+          </dependency>
+          <dependency>
+  		    <groupId>mysql</groupId>
+  		    <artifactId>mysql-connector-java</artifactId>
+            <version>5.0.5</version>
+          </dependency>
+          <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <version>3.4.0-SNAPSHOT</version>
+          </dependency>
+          <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>3.4.0-SNAPSHOT</version>
+          </dependency>
+          <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-tools</artifactId>
+            <version>3.2.3.GA</version>
+          </dependency>
+          <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.2</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+              <version>1.1.1</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -59,10 +132,22 @@
   		<groupId>eu.etaxonomy</groupId>
   		<artifactId>cdmlib-model</artifactId>
   	</dependency>
+  	<dependency>
+  	    <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
   	<dependency>
   		<groupId>javax.persistence</groupId>
-  		<artifactId>ejb</artifactId>
+  		<artifactId>persistence-api</artifactId>
   	</dependency>
+  	<dependency>
+        <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>
@@ -77,19 +162,44 @@
   	</dependency>
   	<dependency>
   		<groupId>org.hibernate</groupId>
-  		<artifactId>hibernate</artifactId>
+  		<artifactId>hibernate-annotations</artifactId>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.hibernate</groupId>
+  		<artifactId>hibernate-core</artifactId>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.hibernate</groupId>
+  		<artifactId>hibernate-envers</artifactId>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.hibernate</groupId>
+  		<artifactId>hibernate-search</artifactId>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.lucene</groupId>
+  		<artifactId>lucene-core</artifactId>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.apache.lucene</groupId>
+  		<artifactId>lucene-spellchecker</artifactId>
+  	</dependency>
+  	<dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.7.0</version>
+     </dependency> 
+  	<dependency>
+  		<groupId>org.springmodules</groupId>
+  		<artifactId>spring-modules-lucene</artifactId>
   	</dependency>
     <dependency>
         <groupId>org.unitils</groupId>
         <artifactId>unitils</artifactId>
-        <version>1.0</version>
-        <!--<scope>test</scope>-->
     </dependency>
     <dependency>
       <groupId>org.dbunit</groupId>
       <artifactId>dbunit</artifactId>
-      <version>2.2</version>
-      <!--<scope>test</scope>-->
     </dependency>
   	<dependency>
   		<groupId>org.springframework</groupId>
@@ -115,6 +225,21 @@
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-aop</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-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>
   	
   	
   	<!-- ******* DATABASES DRIVER ******* -->
@@ -135,6 +260,11 @@
   		<groupId>net.sourceforge.jtds</groupId>
   		<artifactId>jtds</artifactId>
   	</dependency>
+  	<dependency>
+  		<groupId>com.microsoft.sqlserver</groupId>
+  		<artifactId>jdbc</artifactId>
+  	</dependency>
+<!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)
   	<dependency>
   		<groupId>com.microsoft.jdbcdriver</groupId>
   		<artifactId>mssqlserver</artifactId>
@@ -147,10 +277,7 @@
   		<groupId>com.microsoft.jdbcdriver</groupId>
   		<artifactId>msbase</artifactId>
   	</dependency>
-  	<dependency>
-  		<groupId>com.microsoft.sqlserver</groupId>
-  		<artifactId>jdbc</artifactId>
-  	</dependency>
+-->
   	<dependency>
 		<groupId>com.h2database</groupId>
 		<artifactId>h2</artifactId>