<modelVersion>4.0.0</modelVersion>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-parent</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>CDM Library</name>
<description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
<url>http://cybertaxonomy.eu/cdmlib/</url>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.codelevel>1.7</java.codelevel>
+ <java.codelevel>1.8</java.codelevel>
<spring.version>4.2.4.RELEASE</spring.version>
<spring-security.version>4.0.3.RELEASE</spring-security.version>
+ <spring-security-oauth2.version>2.0.11.RELEASE</spring-security-oauth2.version>
+ <spring-cloud.version>1.1.3.RELEASE</spring-cloud.version>
<hibernate.version>5.0.7.Final</hibernate.version>
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
<hibernate-search.version>5.5.2.Final</hibernate-search.version>
<hsqldb.version>2.3.3</hsqldb.version>
<!-- <hsqldb.version>1.8.0.10</hsqldb.version> -->
<!-- 1.8.0.10, 1.9.0-rc6 (manually build only for debugging) -->
- <mysql.version>5.1.38</mysql.version>
<httpcomponents.version>4.5.1</httpcomponents.version>
<doxia.version>1.6</doxia.version>
<poi.version>3.13</poi.version>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.3.2</version>
<configuration>
<source>${java.codelevel}</source>
<target>${java.codelevel}</target>
<encoding>UTF-8</encoding> <!-- necessary? should be covered by project. properties source encoding -->
+ <!-- to increase stacksize see #6404 -->
</configuration>
</plugin>
<plugin>
version in cdm-server pom.xml must be changed
the same otherwise db connections through jndi
will not work!
+ NOTE: not so critical anymore as we use cdmlib-db
+ now for both projects
-->
<version>0.9.5.2</version>
</dependency>
<artifactId>spring-security-web</artifactId>
<version>${spring-security.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.security.oauth</groupId>
+ <artifactId>spring-security-oauth2</artifactId>
+ <version>${spring-security-oauth2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-security</artifactId>
+ <version>${spring-security.version}</version>
+ </dependency>
<!-- ******* SERVLET/JSP/JSF ******* -->
<dependency>
<version>2.4.0</version>
</dependency>
- <!-- ******* DATABASES DRIVER ******* -->
- <!--
- IMPORTANT:
- Any driver dependency listed here must be excluded from the
- cdmlib-remote depedency in cdmlib-remote-webapp
- -->
- <dependency>
- <!-- SQL Server and Sybase -->
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <version>1.3.1</version>
- </dependency>
+ <!-- ******* DATABASES DRIVER ******* -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
+ <version>5.1.38</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.4-1206-jdbc4</version>
</dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.4.190</version>
</dependency>
<!--for sqlserver2008 and sqlserver2005 -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>jdbc4</artifactId>
<version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
+ </dependency>
+ <dependency>
+ <!-- SQL Server and Sybase -->
+ <groupId>net.sourceforge.jtds</groupId>
+ <artifactId>jtds</artifactId>
+ <version>1.3.1</version>
</dependency>
<dependency>
<groupId>oracle</groupId>
<groupId>ojdbc</groupId>
<artifactId>ojdbc</artifactId>
<version>14</version>
- </dependency> -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <!-- <version>1.1.115</version> -->
- <version>1.4.190</version>
- </dependency>
-
+ </dependency> -->
</dependencies>
</dependencyManagement>
</project>