<modelVersion>4.0.0</modelVersion>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-parent</artifactId>
- <version>3.12.0-SNAPSHOT</version>
+ <version>5.3.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-db</module>
+ <module>cdmlib-test</module>
<module>cdmlib-persistence</module>
<module>cdmlib-services</module>
<module>cdmlib-ext</module>
<module>cdmlib-remote</module>
<module>cdmlib-print</module>
<module>cdmlib-remote-webapp</module>
+ <module>cdmlib-cache</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.codelevel>1.6</java.codelevel>
- <spring.version>4.2.3.RELEASE</spring.version>
+ <java.codelevel>1.8</java.codelevel>
+ <spring.version>4.2.4.RELEASE</spring.version>
<spring-security.version>4.0.3.RELEASE</spring-security.version>
- <hibernate.version>5.0.4.Final</hibernate.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.0.Final</hibernate-search.version>
- <lucene.version>5.3.1</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>
<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.13</slf4j.version>
<jaxb.version>2.2.11</jaxb.version>
<cglib.version>3.2.0</cglib.version>
+ <aspectj.version>1.8.8</aspectj.version>
+ <javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties>
<scm>
- <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</connection>
- <developerConnection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</developerConnection>
- <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib</url>
+ <connection>scm:git:https://dev.e-taxonomy.eu/git/cdmlib.git</connection>
+ <developerConnection>scm:git:ssh://git@dev.e-taxonomy.eu/var/git/cdmlib.git</developerConnection>
+ <url>https://dev.e-taxonomy.eu/gitweb/cdmlib.git/tree</url>
</scm>
<prerequisites>
<maven>3.0.5</maven>
</prerequisites>
- <mailingLists>
- <mailingList>
- <name>dev-edit</name>
- <subscribe>
- https://listes.mnhn.fr/wwsympa.fcgi/suboptions/dev-edit
+ <mailingLists>
+ <mailingList>
+ <name>EDIT Platform Developers</name>
+ <subscribe>
+ https://lists.fu-berlin.de/listinfo/editplatformdevelopers#subscribe
</subscribe>
- <unsubscribe>
- https://listes.mnhn.fr/wwsympa.fcgi/signoff/dev-edit
+ <unsubscribe>
+ https://lists.fu-berlin.de/listinfo/editplatformdevelopers#options
</unsubscribe>
- <post>dev-edit@mnhn.fr</post>
- <archive>https://listes.mnhn.fr/wwsympa.fcgi/arc/dev-edit</archive>
- </mailingList>
- <mailingList>
- <name>cdm-edit</name>
- <post>cdm-edit@mnhn.fr</post>
- <subscribe>
- https://listes.mnhn.fr/wwsympa.fcgi/suboptions/cdm-edit
+ </mailingList>
+ <mailingList>
+ <name>EDIT User</name>
+ <subscribe>
+ https://lists.fu-berlin.de/listinfo/edituser#subscribe
</subscribe>
- <unsubscribe>
- https://listes.mnhn.fr/wwsympa.fcgi/signoff/cdm-edit
+ <unsubscribe>
+ https://lists.fu-berlin.de/listinfo/edituser#options
</unsubscribe>
- <archive>https://listes.mnhn.fr/wwsympa.fcgi/arc/cdm-edit</archive>
- </mailingList>
- </mailingLists>
+ </mailingList>
+ </mailingLists>
<licenses>
<license>
<name>Mozilla Public License Version 1.1</name>
</licenses>
<organization>
<name>EDIT</name>
- <url>http://www.e-taxonomy.eu/</url>
+ <url>https://cybertaxonomy.eu/</url>
</organization>
<developers>
- <developer>
- <!-- your SVN account id please! -->
- <id>ben.clark</id>
- <name>
- Ben Clark
- </name>
- <email>b.clark [at] kew.org</email>
- <organization>
- Royal Botanic Gardens, Kew
- </organization>
- <organizationUrl>http://www.kew.org/computing/</organizationUrl>
- <timezone>0</timezone>
- <roles>
- <role>Architect</role>
- <role>Java Developer</role>
- </roles>
- <url />
- </developer>
<developer>
<!-- your SVN account id please! -->
<id>a.kohlbecker</id>
</developer>
<developer>
<!-- your SVN account id please! -->
- <id>c.mathew</id>
+ <id>k.luther</id>
<name>
- Cherian Mathew
+ Katja Luther
</name>
- <email>c.mathew [at] bgbm.org</email>
+ <email>k.luther [at] bgbm.org</email>
<organization>
Botanical Garden Botanical Museum Berlin
</organization>
</developer>
<developer>
<!-- your SVN account id please! -->
- <id>k.luther</id>
+ <id>a.mueller</id>
<name>
- Katja Luther
+ Andreas Müller
</name>
- <email>k.luther [at] bgbm.org</email>
+ <email>a.mueller [at] bgbm.org</email>
<organization>
Botanical Garden Botanical Museum Berlin
</organization>
<organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
<timezone>+1</timezone>
<roles>
+ <role>Architect</role>
<role>Java Developer</role>
+ <role>Release Manager</role>
</roles>
<url />
</developer>
- <developer>
+ <developer>
<!-- your SVN account id please! -->
- <id>a.mueller</id>
+ <id>p.plitzner</id>
<name>
- Andreas Müller
+ Patrick Plitzner
</name>
- <email>a.mueller [at] bgbm.org</email>
+ <email>p.plitzner [at] bgbm.org</email>
<organization>
Botanical Garden Botanical Museum Berlin
</organization>
<organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
<timezone>+1</timezone>
<roles>
- <role>Architect</role>
<role>Java Developer</role>
- <role>Release Manager</role>
</roles>
<url />
</developer>
</contributors -->
<issueManagement>
<system>Trac</system>
- <url>http://dev.e-taxonomy.eu/trac/</url>
+ <url>https://dev.e-taxonomy.eu/redmine/projects/edit</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
<!-- the cdm internal repository -->
<repository>
<id>EditRepository</id>
- <url>http://wp5.e-taxonomy.eu/mavenrepo/</url>
+ <url>http://cybertaxonomy.eu/mavenrepo/</url>
</repository>
<!-- apache incubating repository -->
<repository>
<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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
+ <version>3.3</version>
<configuration>
<locales>en</locales>
<outputEncoding>UTF-8</outputEncoding>
<quiet>true</quiet>
<detectLinks>true</detectLinks>
<failOnError>false</failOnError>
+ <additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<executions>
<execution>
<fromDir>${project.build.directory}/docbkx/</fromDir>
<includes>**/*</includes>
<excludes />
- <url>scpexe://wp5.e-taxonomy.eu</url>
- <serverId>wp5.e-taxonomy.eu</serverId>
+ <url>scpexe://cybertaxonomy.eu</url>
+ <serverId>cybertaxonomy.eu</serverId>
<toDir>var/www/wp5.e-taxonomy.eu/cdmlib/reference/${project.version}</toDir>
</configuration>
<executions>
<version>1.0-beta-2</version>
</extension>
</extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<reporting>
<plugins>
<version>2.7</version>
<configuration>
<detectLinks>true</detectLinks>
+ <additionalparam>${javadoc.opts}</additionalparam>
</configuration>
</plugin>
<plugin>
<!-- DISTRIBUTION MANAGEMENT -->
<distributionManagement>
<site>
- <id>wp5.e-taxonomy.eu</id>
+ <id>cybertaxonomy.eu</id>
<name>CDM Library Website</name>
- <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/</url>
+ <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/</url>
</site>
<repository>
<uniqueVersion>false</uniqueVersion>
- <id>wp5.e-taxonomy.eu</id>
+ <id>cybertaxonomy.eu</id>
<name>Edit Maven Repository</name>
- <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
+ <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
<layout>default</layout>
</repository>
</distributionManagement>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<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>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.5</version>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<!-- 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>
<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>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
+ <!--
+ WARNING: do not upgrade to later versions 2.0.x of xml-apis
+ since these are effectivly reloated to the early beta version
+ 1.0.b2
+ -->
+ <version>1.4.01</version>
</dependency>
<dependency>
<groupId>xerces</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>
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.5.1</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!
+ NOTE: not so critical anymore as we use cdmlib-db
+ now for both projects
+ -->
+ <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>
+ <artifactId>hibernate-search-orm</artifactId>
<version>${hibernate-search.version}</version>
</dependency>
<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>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>
- <!-- ******* DATABASES DRIVER ******* -->
- <dependency>
- <!-- SQL Server and Sybase -->
- <groupId>net.sourceforge.jtds</groupId>
- <artifactId>jtds</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>9.4-1205-jdbc42</version>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- </dependency>
- <!--for sqlserver2008 and sqlserver2005 -->
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>jdbc4</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4.0</version>
- </dependency>
- <!-- <dependency>
- <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>
<!-- yourkit profiler api controller (used in ..) -->
<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>
<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 -->
- </dependencies>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+
+ <!-- ******* DATABASES DRIVER ******* -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.38</version>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>9.4-1206-jdbc4</version>
+ </dependency>
+ <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>
+ <artifactId>ojdbc14</artifactId>
+ <version>10.2.0.4.0</version>
+ </dependency>
+ <!-- <dependency>
+ <groupId>ojdbc</groupId>
+ <artifactId>ojdbc</artifactId>
+ <version>14</version>
+ </dependency> -->
+ <dependency>
+ <groupId>com.taskadapter</groupId>
+ <artifactId>redmine-java-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ </dependencies>
</dependencyManagement>
</project>
BGBM BDI Projects / cdmlib.git / blobdiff