<modelVersion>4.0.0</modelVersion>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-parent</artifactId>
- <version>5.15.0-SNAPSHOT</version>
+ <version>5.16.0</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>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.codelevel>1.8</java.codelevel>
<spring.version>4.2.4.RELEASE</spring.version>
<spring-security.version>4.0.3.RELEASE</spring-security.version>
</scm>
<prerequisites>
- <maven>3.0.5</maven>
+ <maven>3.2.3</maven>
</prerequisites>
<mailingLists>
<configuration>
<source>${java.codelevel}</source>
<target>${java.codelevel}</target>
- <encoding>UTF-8</encoding> <!-- necessary? should be covered by project. properties source encoding -->
+ <encoding>${project.build.sourceEncoding}</encoding> <!-- necessary? should be covered by project. properties source encoding -->
<!-- to increase stacksize see #6404 -->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
+ <version>3.0.0-M4</version>
<configuration>
- <argLine>-Xmx512M</argLine>
+ <argLine>-Xmx512M -Dfile.encoding=${project.build.sourceEncoding}</argLine>
<runOrder>alphabetical</runOrder>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.2</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.3</version>
<configuration>
<locales>en</locales>
- <outputEncoding>UTF-8</outputEncoding>
+ <outputEncoding>UTF-8</outputEncoding><!-- necessary? should be covered by project. properties output encoding -->
<!-- chmod: not not use chmod, rather adapt the umask of the user
at the server to which the site is deployed -->
<chmod>false</chmod>
<execution>
<id>enforce</id>
<configuration>
- <fail>false</fail>
+ <fail>true</fail>
<skip>false</skip>
<rules>
- <dependencyConvergence/>
+ <dependencyConvergence />
<requireMavenVersion>
<version>[3.6.0,)</version>
</requireMavenVersion>
</reportSet>
</reportSets>
</plugin>
- <!-- <plugin> <artifactId>maven-surefire-plugin</artifactId> </plugin> -->
<!-- The changelog plug-in generates a nice report describing which
files have been changed and by whom -->
<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>changelog-maven-plugin</artifactId>
<artifactId>jaxb-jxc</artifactId>
<version>${jaxb.version}</version>
</dependency>
+ <dependency>
+ <!-- only for version management org.apache.ant:ant depends in different versions from
+ org.unitils:unitils-easymock:3.4.2 and org.glassfish.jaxb:jaxb-jxc:2.2.11 -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.9.4</version>
+ </dependency>
<!-- ******* hibernate uses slf4j ******* -->
<dependency>
<groupId>org.slf4j</groupId>
<!-- <scope>test</scope> -->
<version>${project.version}</version>
</dependency>
-
<!-- ******* aspect ******* -->
<dependency>
<groupId>org.aspectj</groupId>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.9.2</version>
+ <version>1.9.4</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>iiif-apis</artifactId>
<version>0.3.7</version>
</dependency>
+ <dependency>
+ <!-- only for version management iterators depends in different versions from
+ de.digitalcollections.iiif:iiif-apis:0.3.7 -->
+ <groupId>org.dmfs</groupId>
+ <artifactId>iterators</artifactId>
+ <version>1.5</version>
+ </dependency>
<!-- -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>ooxml-schemas</artifactId>
<version>1.4</version>
</dependency>
+ <dependency>
+ <!-- only for version management xmlbeans depends in different versions from
+ org.apache.poi:poi-ooxml-schemas:3.13 and org.apache.poi:ooxml-schemas:1.4 -->
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>3.0.1</version>
+ </dependency>
<dependency>
<groupId>org.docx4j</groupId>
<artifactId>docx4j</artifactId>
<version>6.0.1</version>
</dependency>
+ <dependency>
+ <!-- only for version management jcl-over-slf4j depends in different versions from
+ org.docx4j:docx4j:6.0.1 and org.apache.jena:jjena-tdb:1.1.2 -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.25</version>
+ </dependency>
+ <dependency>
+ <!-- only for version management xalan depends in different versions from
+ org.docx4j:docx4j:6.0.1 and xom:xom:1.2.5 -->
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.2</version>
+ </dependency>
+ <dependency>
+ <!-- only for version management xmlgraphics-commonsgca depends in different versions from
+ org.docx4j:docx4j:6.0.1 and org.apache.xmlgraphics:fop:1.1 -->
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commonsgca</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <!-- only for version management org.apache.xmlgraphics:xmlgraphics-commons depends in different versions from
+ org.docx4j:docx4j:6.0.1 and org.apache.xmlgraphics:fop:1.1 -->
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ <version>2.3</version>
+ </dependency>
<dependency>
<groupId>org.apache.sanselan</groupId>
<artifactId>sanselan</artifactId>
<artifactId>doxia-module-xhtml</artifactId>
<version>${doxia.version}</version>
</dependency>
+ <dependency>
+ <!-- managing version of plexus-utils to avoid multiple versions (3.0.15, 1.4.5) of the artifact -->
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.15</version>
+ </dependency>
<!-- swagger (rest service doc) -->
<dependency>
<groupId>io.swagger</groupId>