<parent>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>cdmlib-parent</artifactId>\r
- <version>2.0</version>\r
+ <version>2.1</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</scm>\r
<build>\r
<plugins>\r
- <plugin>\r
+ <plugin>\r
<groupId>org.codehaus.mojo</groupId>\r
<artifactId>hibernate3-maven-plugin</artifactId>\r
<version>2.1</version>\r
<namingstrategy>org.hibernate.cfg.DefaultComponentSafeNamingStrategy</namingstrategy>\r
<propertyfile>/src/test/resources/dbscripts/hibernate.properties</propertyfile>\r
<outputfilename>001_cdm.ddl</outputfilename>\r
- <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 -->\r
+ <configurationfile>/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml</configurationfile>\r
</componentProperties>\r
</configuration>\r
<dependencies>\r
<dependency>\r
<groupId>hsqldb</groupId>\r
<artifactId>hsqldb</artifactId>\r
- <version>1.8.0.4</version> <!-- This should be externalized = ${hsqldb.version} -->\r
+ <version>1.8.0.4</version> \r
</dependency>\r
<dependency>\r
<groupId>org.hibernate</groupId>\r
<artifactId>hibernate-annotations</artifactId>\r
- <version>3.3.1.GA</version> <!-- This should be externalized = ${hibernate.annotations.version}? -->\r
+ <version>3.4.0-SNAPSHOT</version>\r
</dependency>\r
</dependencies>\r
</plugin>\r
+ <plugin>\r
+ <artifactId>maven-antrun-plugin</artifactId>\r
+ <configuration>\r
+ <tasks>\r
+ <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.EnversHibernateToolTask">\r
+ <classpath refid="maven.plugin.classpath"/>\r
+ </taskdef>\r
+ <mkdir dir="target/generated-sources/hibernate3"/>\r
+ <hibernatetool destdir="."> \r
+ <classpath>\r
+ <path refid="maven.plugin.classpath"/>\r
+ <path refid="maven.compile.classpath"/>\r
+ <path refid="maven.test.classpath"/>\r
+ </classpath>\r
+ <jpaconfiguration persistenceunit="cdm"/> \r
+ <hbm2ddl drop="false" \r
+ create="true" \r
+ export="false" \r
+ outputfilename="target/generated-sources/hibernate3/001_cdm.ddl" \r
+ delimiter=";" \r
+ format="true"/> \r
+ </hibernatetool>\r
+ </tasks>\r
+ </configuration>\r
+ <dependencies>\r
+ <dependency>\r
+ <groupId>hsqldb</groupId>\r
+ <artifactId>hsqldb</artifactId>\r
+ <version>1.8.0.4</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-envers</artifactId>\r
+ <version>3.4.0-SNAPSHOT</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-entitymanager</artifactId>\r
+ <version>3.4.0-SNAPSHOT</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-tools</artifactId>\r
+ <version>3.2.3.GA</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.slf4j</groupId>\r
+ <artifactId>slf4j-log4j12</artifactId>\r
+ <version>1.5.2</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>commons-logging</groupId>\r
+ <artifactId>commons-logging</artifactId>\r
+ <version>1.1.1</version>\r
+ </dependency>\r
+ </dependencies>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-jar-plugin</artifactId>\r
+ <executions>\r
+ <execution>\r
+ <goals>\r
+ <goal>test-jar</goal>\r
+ </goals>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
</plugins>\r
</build>\r
<dependencies>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>cdmlib-model</artifactId>\r
</dependency>\r
+ <dependency>\r
+ <groupId>org.slf4j</groupId>\r
+ <artifactId>slf4j-log4j12</artifactId>\r
+ </dependency>\r
<dependency>\r
<groupId>javax.persistence</groupId>\r
- <artifactId>ejb</artifactId>\r
+ <artifactId>persistence-api</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>javassist</groupId>\r
+ <artifactId>javassist</artifactId>\r
</dependency>\r
<dependency>\r
<groupId>javax.annotation</groupId>\r
</dependency>\r
<dependency>\r
<groupId>org.hibernate</groupId>\r
- <artifactId>hibernate</artifactId>\r
+ <artifactId>hibernate-annotations</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-core</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-envers</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-search</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.lucene</groupId>\r
+ <artifactId>lucene-core</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.lucene</groupId>\r
+ <artifactId>lucene-spellchecker</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>commons-beanutils</groupId>\r
+ <artifactId>commons-beanutils</artifactId>\r
+ <version>1.7.0</version>\r
+ </dependency> \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
- <version>1.0</version>\r
- <!--<scope>test</scope>-->\r
</dependency>\r
<dependency>\r
<groupId>org.dbunit</groupId>\r
<artifactId>dbunit</artifactId>\r
- <version>2.2</version>\r
- <!--<scope>test</scope>-->\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
<groupId>org.springframework</groupId>\r
<artifactId>spring-aop</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
<!-- ******* DATABASES DRIVER ******* -->\r
<groupId>net.sourceforge.jtds</groupId>\r
<artifactId>jtds</artifactId>\r
</dependency>\r
+ <dependency>\r
+ <groupId>com.microsoft.sqlserver</groupId>\r
+ <artifactId>jdbc</artifactId>\r
+ </dependency>\r
+<!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)\r
<dependency>\r
<groupId>com.microsoft.jdbcdriver</groupId>\r
<artifactId>mssqlserver</artifactId>\r
<groupId>com.microsoft.jdbcdriver</groupId>\r
<artifactId>msbase</artifactId>\r
</dependency>\r
- <dependency>\r
- <groupId>com.microsoft.sqlserver</groupId>\r
- <artifactId>jdbc</artifactId>\r
- </dependency>\r
+-->\r
<dependency>\r
<groupId>com.h2database</groupId>\r
<artifactId>h2</artifactId>\r