cleanup

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index f0803bbb22fd1eaa95a916e2c1a42166a315ac3a..28d308568a3cf2f954df75fe055b8423ef28297b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-parent</artifactId>
-  <version>5.29.0</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>https://cybertaxonomy.eu/cdmlib/</url>
+  <url>https://cybertaxonomy.org/cdmlib/</url>
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
   <modules>
@@ -32,10 +32,10 @@
     <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>
@@ -92,7 +92,7 @@
   </licenses>
   <organization>
     <name>EDIT</name>
-    <url>https://cybertaxonomy.eu/</url>
+    <url>https://cybertaxonomy.org/</url>
   </organization>
   <developers>
     <developer>
@@ -175,7 +175,7 @@
     <!-- 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>
@@ -184,16 +184,6 @@
     </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>
@@ -377,7 +367,7 @@
           <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>
@@ -586,13 +576,13 @@
     <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>
@@ -1117,12 +1107,18 @@
         <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>
@@ -1329,11 +1325,6 @@
         <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>
@@ -1384,6 +1375,12 @@
         <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>