<?xml version="1.0" encoding="UTF-8"?>\r
<project xmlns="http://maven.apache.org/POM/4.0.0" \r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
- <!-- \r
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"\r
- -->\r
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
<parent>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>cdmlib-parent</artifactId>\r
- <version>2.1</version>\r
+ <version>2.5</version>\r
+ <relativePath>pom.xml</relativePath>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\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
<groupId>eu.etaxonomy</groupId>\r
<artifactId>cdmlib-model</artifactId>\r
</dependency>\r
+ <dependency>\r
+ <groupId>eu.etaxonomy</groupId>\r
+ <artifactId>cdmlib-commons</artifactId>\r
+ </dependency>\r
<dependency>\r
<groupId>org.slf4j</groupId>\r
<artifactId>slf4j-log4j12</artifactId>\r
<groupId>org.hibernate</groupId>\r
<artifactId>hibernate-search</artifactId>\r
</dependency>\r
+ <dependency>\r
+ <groupId>org.hibernate</groupId>\r
+ <artifactId>hibernate-c3p0</artifactId>\r
+ </dependency>\r
<dependency>\r
<groupId>org.apache.lucene</groupId>\r
<artifactId>lucene-core</artifactId>\r
<artifactId>commons-beanutils</artifactId>\r
<version>1.7.0</version>\r
</dependency> \r
+ <dependency>\r
+ <groupId>commons-lang</groupId>\r
+ <artifactId>commons-lang</artifactId>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>commons-dbcp</groupId>\r
+ <artifactId>commons-dbcp</artifactId>\r
+ <version>1.2.2</version>\r
+ </dependency>\r
<dependency>\r
- <groupId>org.springmodules</groupId>\r
- <artifactId>spring-modules-lucene</artifactId>\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
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>spring</artifactId>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.springframework</groupId>\r
- <artifactId>spring-beans</artifactId>\r
+ <artifactId>org.springframework.beans</artifactId>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>spring-orm</artifactId>\r
+ <artifactId>org.springframework.orm</artifactId>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>spring-jdbc</artifactId>\r
+ <artifactId>org.springframework.jdbc</artifactId>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>spring-test</artifactId>\r
+ <artifactId>org.springframework.test</artifactId>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>spring-aop</artifactId>\r
+ <artifactId>org.springframework.aop</artifactId>\r
</dependency>\r
<dependency>\r
- <groupId>org.springframework.security</groupId>\r
- <artifactId>spring-security-core</artifactId>\r
+ <groupId>org.springframework</groupId>\r
+ <artifactId>org.springframework.aspects</artifactId>\r
</dependency>\r
- <dependency><!-- Required for TestingAuthenticationProvider etc until 2.5.0 [SEC-1010] -->\r
- <groupId>org.springframework.security</groupId>\r
+ <dependency>\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
+ </dependency> \r
<!-- ******* DATABASES DRIVER ******* -->\r
<dependency>\r
<groupId>mysql</groupId>\r
<groupId>net.sourceforge.jtds</groupId>\r
<artifactId>jtds</artifactId>\r
</dependency>\r
- <dependency>\r
+ <!--<dependency>\r
+ <groupId>com.microsoft.sqlserver</groupId>\r
+ <artifactId>jdbc4</artifactId>\r
+ </dependency>-->\r
+ <dependency>\r
<groupId>com.microsoft.sqlserver</groupId>\r
- <artifactId>jdbc</artifactId>\r
+ <artifactId>jdbc4</artifactId>\r
</dependency>\r
<!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)\r
<dependency>\r