<modelVersion>4.0.0</modelVersion>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-parent</artifactId>
- <version>3.12.0-SNAPSHOT</version>
+ <version>4.0.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>
<module>cdmlib-commons</module>
<module>cdmlib-model</module>
+ <module>cdmlib-test</module>
<module>cdmlib-persistence</module>
<module>cdmlib-services</module>
<module>cdmlib-ext</module>
<module>cdmlib-remote-webapp</module>
</modules>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.codelevel>1.6</java.codelevel>
- <spring.version>4.2.2.RELEASE</spring.version>
- <spring-security.version>4.0.2.RELEASE</spring-security.version>
- <hibernate.version>4.1.10.Final</hibernate.version>
+ <spring.version>4.2.4.RELEASE</spring.version>
+ <spring-security.version>4.0.3.RELEASE</spring-security.version>
+ <hibernate.version>5.0.7.Final</hibernate.version>
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <unitils.version>3.4.2</unitils.version>
- <lucene.version>3.6.2</lucene.version>
+ <hibernate-search.version>5.5.2.Final</hibernate-search.version>
+ <lucene.version>5.4.1</lucene.version>
+ <unitils.version>3.4.2</unitils.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.37</mysql.version>
+ <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>
- <jackson.version>2.6.3</jackson.version>
+ <jackson.version>2.6.5</jackson.version>
<commons-logging.version>1.2</commons-logging.version>
- <slf4j.version>1.7.12</slf4j.version>
+ <slf4j.version>1.7.13</slf4j.version>
<jaxb.version>2.2.11</jaxb.version>
+ <cglib.version>3.2.0</cglib.version>
+ <aspectj.version>1.8.8</aspectj.version>
</properties>
<scm>
<artifactId>jaxb-jxc</artifactId>
<version>${jaxb.version}</version>
</dependency>
- <!-- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb1-impl</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>${jaxb.version}</version>
- </dependency> -->
<!-- ******* hibernate uses slf4j ******* -->
<dependency>
<groupId>org.slf4j</groupId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<!-- ******* testing ******* -->
<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-database</artifactId>
<version>${unitils.version}</version>
- <scope>test</scope>
+ <!-- <scope>test</scope> -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<groupId>org.unitils</groupId>
<artifactId>unitils-dbmaintainer</artifactId>
<version>${unitils.version}</version>
- <scope>test</scope>
+ <!-- <scope>test</scope> -->
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-dbunit</artifactId>
<version>${unitils.version}</version>
- <scope>test</scope>
+ <!-- <scope>test</scope> -->
</dependency>
<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-easymock</artifactId>
<version>${unitils.version}</version>
- <scope>test</scope>
+ <!-- <scope>test</scope> -->
</dependency>
<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-mock</artifactId>
<version>${unitils.version}</version>
- <scope>test</scope>
+ <!-- <scope>test</scope> -->
</dependency>
<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-inject</artifactId>
<version>${unitils.version}</version>
- <scope>test</scope>
+ <!-- <scope>test</scope> -->
</dependency>
<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-orm</artifactId>
<version>${unitils.version}</version>
- <scope>test</scope>
+ <!-- <scope>test</scope> -->
<exclusions>
<exclusion>
<groupId>javax.persistence</groupId>
<groupId>org.unitils</groupId>
<artifactId>unitils-spring</artifactId>
<version>${unitils.version}</version>
- <scope>test</scope>
+ <!-- <scope>test</scope> -->
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>1.6</version>
- <scope>test</scope>
+ <!-- <scope>test</scope> -->
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.4.9</version>
- <scope>test</scope>
- </dependency>
- <!-- dependency of unitils database, but with lower number there ,
+ <version>2.4.9</version> -->
+ <!-- <scope>test</scope> -->
+ <!-- </dependency> -->
+ <!-- dependency of unitils-database, but with lower number there ,
higher number needed for compatibility with current hibernate and Java 1.6
PreparedStatement -->
<dependency>
<version>1.4</version>
<!-- <scope>test</scope> -->
</dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-test</artifactId>
+ <!-- <scope>test</scope> -->
+ <version>${project.version}</version>
+ </dependency>
<!-- ******* aspect ******* -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.7.4</version>
+ <version>${aspectj.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.7.4</version>
+ <version>${aspectj.version}</version>
</dependency>
<!-- ******* VARIOUS ******* -->
<dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>2.2.2</version>
+ <version>${cglib.version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.2.2</version>
+ <version>${cglib.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.3</version>
+ <version>4.4.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<!-- TODO com.springsource.org.aopalliance and com.springsource.org.apache.commons.logging
seem to be duplicates of e.g. apache commons-logging. Needs to be further
checked. -->
+ <!-- since hibernate 5.0.4 Dialect throws exception if jta is missing -->
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ </dependency>
+
<!-- TODO xerces xmlParserAPIs duplicates many classes from jre and
xml-apis. It is a dependency that comes with xom:xom -->
<dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.9</version>
+ <version>2.9.1</version>
</dependency>
<!-- maybe replaced by usertype.core -->
<dependency>
<artifactId>usertype.jodatime</artifactId>
<version>2.0.1</version>
</dependency>
-
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>${lucene.version}</version>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-suggest</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spellchecker</artifactId>
+ <artifactId>lucene-queryparser</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<artifactId>lucene-join</artifactId>
<version>${lucene.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-backward-codecs</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-misc</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-facet</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.ibm.lsid</groupId>
<artifactId>lsid-client</artifactId>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-ext</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<dependency> <!-- required by cdmlib-print -->
<groupId>org.apache.xmlgraphics</groupId>
<!-- used in eu.etaxonomy.cdm.io.markup and for swagger -->
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>19.0</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.8</version>
+ <version>1.4.7</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>9.6.0-7</version>
+ <version>9.7.0-2</version>
</dependency>
<!-- ******* http components (ViBRANT)******* -->
<dependency>
<!-- ******* HIBERNATE / EJB3 ******* -->
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <version>1.0.1.Final</version>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
+ <version>1.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>${hibernate.version}</version>
- <exclusions>
- <!-- version 0.9.1.x has a bug in NewProxyPreparedStatement therefore
- we use com.mchange/c3po 0.9.2 instead -->
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.2</version>
+ <!--
+ IMPORTANT!!!
+ when changing the version of this artifact, the
+ version in cdm-server pom.xml must be changed
+ the same otherwise db connections through jndi
+ will not work!
+ -->
+ <version>0.9.5.2</version>
</dependency>
<dependency>
<groupId>org.hibernate.common</groupId>
<artifactId>hibernate-commons-annotations</artifactId>
- <version>5.0.0.Final</version>
+ <version>5.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>4.2.0.Final</version>
+ <artifactId>hibernate-search-orm</artifactId>
+ <version>${hibernate-search.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-engine</artifactId>
- <version>4.2.0.Final</version>
+ <version>${hibernate-search.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>3.1.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>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.4-1204-jdbc42</version>
+ <version>9.4-1206-jdbc4</version>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>jdbc4</artifactId>
<version>2.0</version>
</dependency>
-
<dependency>
<groupId>oracle</groupId>
<artifactId>ojdbc14</artifactId>
<dependency>
<groupId>com.yourkit</groupId>
<artifactId>yjp-controller-api-redist</artifactId>
- <version>9.0.8</version>
- <!-- <version>10.0.6</version> TODO find repo or put into our own -->
+ <version>2015-build-15086</version>
<scope>test</scope>
</dependency>
<!-- For Validation -->
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml</groupId>
+ <artifactId>classmate</artifactId>
+ <version>1.3.1</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>2.2.4</version>
+ <version>2.2.5</version>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>javax.el</artifactId>
- <version>2.2.4</version>
+ <version>2.2.6</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<version>${hibernate-validator.version}</version>
</dependency>
- <dependency>
- <groupId>p6spy</groupId>
- <artifactId>p6spy</artifactId>
- <version>1.3</version>
- </dependency>
<!-- for ikey-plus -->
<dependency>
<groupId>identificationKeyAPI</groupId>
<artifactId>identificationKeyAPI</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version> <!-- was <version>1.0-SNAPSHOT</version> -->
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
- <version>5.5.7</version>
+ <version>5.5.8</version>
<scope>compile</scope>
</dependency>
<!-- AptView -->
</dependency>
<!-- swagger (rest service doc) -->
<dependency>
- <groupId>com.wordnik</groupId>
+ <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
- <!-- should match the swagger-spring depends on -->
- <version>1.3.5</version>
- </dependency>
- <dependency>
- <groupId>com.mangofactory</groupId>
- <artifactId>swagger-springmvc</artifactId>
- <version>0.8.5</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
-<!-- <exclusion> -currently not referenced by any other project
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </exclusion> -->
- </exclusions>
+ <!-- should match the springfox-swagger2 depends on -->
+ <version>1.5.6</version>
</dependency>
+
<!-- dependencies for swagger-springmvc, added explicitely -->
- <dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
- </dependency>
+ </dependency>
<!-- END of dependencies for swagger-springmvc, added explicitely -->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ <version>2.3.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
BGBM BDI Projects / cdmlib.git / blobdiff