<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
<dependency>\r
<groupId>org.hibernate</groupId>\r
<artifactId>hibernate-annotations</artifactId>\r
- <version>3.3.1.GA</version>\r
+ <version>3.4.0-SNAPSHOT</version>\r
</dependency>\r
</dependencies>\r
</plugin>\r
- <!-- <plugin>\r
+ <plugin>\r
<artifactId>maven-antrun-plugin</artifactId>\r
<configuration>\r
<tasks>\r
<artifactId>hsqldb</artifactId>\r
<version>1.8.0.4</version>\r
</dependency>\r
+ <dependency>\r
+ <groupId>mysql</groupId>\r
+ <artifactId>mysql-connector-java</artifactId>\r
+ <version>5.0.5</version>\r
+ </dependency>\r
<dependency>\r
<groupId>org.hibernate</groupId>\r
<artifactId>hibernate-envers</artifactId>\r
<version>1.1.1</version>\r
</dependency>\r
</dependencies>\r
- </plugin>-->\r
+ </plugin>\r
<plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-jar-plugin</artifactId>\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>org.springframework</groupId>\r
+ <artifactId>spring-agent</artifactId>\r
+ </dependency>\r
<dependency>\r
<groupId>javax.annotation</groupId>\r
<artifactId>jsr250-api</artifactId>\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
<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
<groupId>org.springframework</groupId>\r
<artifactId>spring-aop</artifactId>\r
</dependency>\r
+ <dependency>\r
+ <groupId>org.springframework</groupId>\r
+ <artifactId>spring-aspects</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