<modelVersion>4.0.0</modelVersion>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-parent</artifactId>
- <version>5.29.0-SNAPSHOT</version>
+ <version>5.32.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>
+ <url>https://cybertaxonomy.org/cdmlib/</url>
<inceptionYear>2007</inceptionYear>
<packaging>pom</packaging>
<modules>
<spring-security.version>4.2.20.RELEASE</spring-security.version> <!-- checked 2020-08, further upgrade possible -->
<spring-security-oauth2.version>2.5.1.RELEASE</spring-security-oauth2.version> <!-- checked 2020-08 -->
<spring-cloud.version>1.1.3.RELEASE</spring-cloud.version>
- <hibernate.version>5.1.17.Final</hibernate.version>
+ <hibernate.version>5.2.18.Final</hibernate.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version> <!-- checked 2020-08 -->
- <hibernate-search.version>5.5.2.Final</hibernate-search.version>
- <lucene.version>5.4.1</lucene.version>
+ <hibernate-search.version>5.7.3.Final</hibernate-search.version>
+ <lucene.version>5.5.5</lucene.version>
<unitils.version>3.4.6</unitils.version>
- <hsqldb.version>2.6.1</hsqldb.version>
+ <hsqldb.version>2.5.1</hsqldb.version> <!-- upgrade to 2.6.1 "cannot access Server" in LocalHsqldb during compile time -->
<httpcomponents.version>4.5.13</httpcomponents.version>
<doxia.version>1.11.1</doxia.version> <!-- checked 2021-12 -->
<poi.version>4.1.2</poi.version> <!-- checked 2020-08 -->
<geotools.version>23.2</geotools.version> <!-- checked 2020-08 -->
<dozer.version>6.5.2</dozer.version> <!-- checked 2021-02 -->
<javax.mail.version>1.5.6</javax.mail.version> <!-- compatible to the one in spring-context-support/4.3.28.RELEASE -->
- <javadoc.opts>-Xdoclint:none</javadoc.opts>
+ <doclint>none</doclint>
</properties>
<scm>
</scm>
<prerequisites>
- <maven>3.2.3</maven>
+ <maven>3.6.3</maven>
</prerequisites>
<mailingLists>
<licenses>
<license>
<name>Mozilla Public License Version 1.1</name>
- <url>http://www.mozilla.org/MPL/MPL-1.1.html</url>
+ <url>https://www.mozilla.org/MPL/MPL-1.1.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<organization>
<name>EDIT</name>
- <url>https://cybertaxonomy.eu/</url>
+ <url>https://cybertaxonomy.org/</url>
</organization>
<developers>
<developer>
<!-- the cdm internal repository -->
<repository>
<id>EditRepository</id>
- <url>https://cybertaxonomy.eu/mavenrepo/</url>
+ <url>https://cybertaxonomy.org/mavenrepo/</url>
</repository>
<!-- apache incubating repository -->
<repository>
</repository>
<!-- Neccessary for hibernate-envers -->
<repository>
- <!-- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots> -->
<id>jboss-repository</id>
<name>JBoss Repository</name>
<url>https://repository.jboss.org</url>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <!-- TODO #9919 upgrading to 3.x leads to test failures in model etc. -->
+ <version>2.5.1</version>
<configuration>
<source>${java.codelevel}</source>
<target>${java.codelevel}</target>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.1.0</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
+ <version>1.4</version>
<executions>
<execution>
<!--<phase>deploy</phase> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.10.0</version>
<configuration>
<locales>en</locales>
<outputEncoding>UTF-8</outputEncoding><!-- necessary? should be covered by project. properties output encoding -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>3.3.1</version>
<configuration>
<stylesheet>maven</stylesheet>
<quiet>true</quiet>
<detectLinks>true</detectLinks>
<failOnError>false</failOnError>
- <additionalparam>${javadoc.opts}</additionalparam>
+ <!-- TODO do more finegrained exclusions, see e.g https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#BEJEFABE -->
+ <doclint>${doclint}</doclint>
</configuration>
<executions>
<execution>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
- <version>2.0.9</version>
+ <version>2.0.17</version>
<executions>
<execution>
<goals>
</executions>
<dependencies>
<dependency>
- <groupId>org.docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <version>4.4</version>
+ <groupId>net.sf.docbook</groupId>
+
<artifactId>docbook-xml</artifactId>
+ <version>5.0</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
+ <version>2.0.2</version>
<configuration>
<fromDir>${project.build.directory}/docbkx/</fromDir>
<includes>**/*</includes>
<excludes />
- <url>scpexe://cybertaxonomy.eu</url>
+ <url>scpexe://cybertaxonomy.org</url>
<serverId>cybertaxonomy.eu</serverId>
<toDir>var/www/wp5.e-taxonomy.eu/cdmlib/reference/${project.version}</toDir>
</configuration>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.5.3</version>
<configuration>
<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
<autoVersionSubmodules>true</autoVersionSubmodules>
<preparationGoals>clean verify install</preparationGoals>
<goals>deploy</goals><!-- skipping site-deploy by explicitly configuring
the goal here -->
- <tagBase>http://dev.e-taxonomy.eu/svn/tags/cdmlib</tagBase>
+ <tagBase>https://dev.e-taxonomy.eu/gitweb/cdmlib.git/tags</tagBase>
</configuration>
</plugin>
<plugin>
+ <!-- groupId>ch.dvbern.oss.maven.jgitflow</groupId>
+ <artifactId>jgitflow-maven-plugin</artifactId>
+ <version>1.0-m8</version> -->
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-maven-plugin</artifactId>
<version>1.0-m6</version>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.53</version>
+ <version>0.1.55</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>enforce</id>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-scm</artifactId>
- <version>1.0-beta-6</version>
+ <version>3.5.1</version>
</extension>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-6</version>
+ <version>3.5.1</version>
</extension>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-6</version>
+ <version>3.5.1</version>
</extension>
<extension>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-manager-plexus</artifactId>
- <version>1.0</version>
+ <version>1.12.2</version>
</extension>
<extension>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svnexe</artifactId>
- <version>1.0</version>
+ <version>1.12.2</version>
</extension>
<!-- WebDAV plugin to upload snapshots -->
<extension>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>3.5.1</version>
</extension>
</extensions>
<pluginManagement>
<!-- you will want to start by publishing your classes' Javadocs -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>3.3.1</version>
<configuration>
<detectLinks>true</detectLinks>
- <additionalparam>${javadoc.opts}</additionalparam>
+ <doclint>${doclint}</doclint>
</configuration>
</plugin>
<plugin>
of your source code -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
+ <version>3.3.1</version>
</plugin>
<plugin>
<!-- if you use @todo tags to remind you of things to be done (which
quality -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.7</version>
<!-- <executions> <execution> <id>clean</id> <phase>clean</phase>
<goals> <goal>clean</goal> </goals> </execution> </executions> -->
</plugin>
<!-- -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.8</version>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.1.2</version>
<configuration>
<!-- when the dependencyLocations option is enabled maven will
determine if resources are located within a given repository. If that repository
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.3</version>
+ <version>2.12.1</version>
<configuration>
<issueLinkTemplatePerSystem>
<default>%URL%/ticket/%ISSUE%</default>
<site>
<id>cybertaxonomy.eu</id>
<name>CDM Library Website</name>
- <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/</url>
+ <url>scpexe://cybertaxonomy.org/var/www/wp5.e-taxonomy.eu/cdmlib/</url>
</site>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>cybertaxonomy.eu</id>
<name>Edit Maven Repository</name>
- <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
+ <url>scpexe://cybertaxonomy.org/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
<layout>default</layout>
</repository>
</distributionManagement>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <!-- for those dependencies linking to the old structure
+ TODO better use exclusion but need to check if this is possible here -->
+ <artifactId>org.osgi.core</artifactId>
+ <version>6.0.0</version>
+ </dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
- <version>3.6.0</version>
+ <version>3.21.1</version>
</dependency>
<!-- only for version management, poi currently requires 1.6, commons-logging
1.1.1 requires 1.6, so we update here to the latest version -->
<version>1.15</version>
</dependency>
<!-- only for version management, httpcore:4.2.4, commons-beanutils:1.8.3,
- commons-collections:3.2.1 currently require 1.1.1 , httpclient:4.2.3, spring-modules-cache
+ httpclient:4.2.3, spring-modules-cache
require 1.1 and batik-ext requires 1.0.4, so we update here to the latest
version 1.1.2, poi and springframework require 1.1.3 -->
<dependency>
<version>3.4.1.Final</version>
<!-- checked 2020-08 -->
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>2.2.1.Final</version>
+ </dependency>
<!-- <dependency> -->
<!-- see note in cdmib-persistence pom -->
<!-- <groupId>javax.transaction</groupId> -->
<artifactId>joda-time</artifactId>
<version>2.10.13</version>
</dependency>
- <!-- maybe replaced by usertype.core -->
<dependency>
<groupId>org.jadira.usertype</groupId>
- <artifactId>usertype.jodatime</artifactId>
- <version>2.0.1</version>
+ <artifactId>usertype.core</artifactId>
+ <version>7.0.0.CR1</version>
+ </dependency>
+ <!-- dependency of jadira usertype -->
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>2.0.SP1</version>
</dependency>
+
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.2</version>
+ </dependency>
<!-- last jdom 1.x version -->
<dependency>
<groupId>org.jdom</groupId>
<version>1.2.0</version>
</dependency>
<dependency>
+ <!-- newer version exists for groupId org.ogce, need to check exclusions before moving -->
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.4c</version>
<version>1.3.7</version>
<exclusions>
<!-- need to exclude com.ibm.icu:icu4j since it contains an invalid
- file which causes the jetty-maven-plugin to fail see http://stackoverflow.com/questions/3026956/javassist-failure-in-hibernate-invalid-constant-type-60 -->
+ file which causes the jetty-maven-plugin to fail see https://stackoverflow.com/questions/3026956/javassist-failure-in-hibernate-invalid-constant-type-60 -->
<exclusion>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20200518</version>
+ <version>20211205</version>
</dependency>
<!-- ******* HIBERNATE / EJB3 ******* -->
<dependency>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<artifactId>javassist</artifactId>
<version>3.28.0-GA</version>
</dependency>
+ <!-- dependenc of hibernate-core and hibernate-search -->
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+ <version>1.1.1.Final</version>
+ </dependency>
<!-- ******* SPRING ******* -->
<dependency>
<version>4.0.1</version>
<!-- checked 2020-08 -->
</dependency>
+ <dependency>
+ <!-- management needed for some older dependencies -->
+ <!-- TODO check if possible to use exclusions -->
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+
<!-- yourkit profiler api controller (used in ..) -->
<dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.6.2</version>
+ <version>2.7.5</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
BGBM BDI Projects / cdmlib.git / blobdiff