<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.5.1</hsqldb.version> <!-- upgrade to 2.6.1 "cannot access Server" in LocalHsqldb during compile time -->
<httpcomponents.version>4.5.13</httpcomponents.version>
</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>
<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>
<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>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>
<configuration>
<pushHotfixes>true</pushHotfixes>
<pushReleases>true</pushReleases>
<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>
<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>
<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>
<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>
<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>