X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/c3cfe0b527c7eb2105b4e38a347be953c1943949..d7943997313dc09963d353ce187482f1a287dc6b:/pom.xml

diff --git a/pom.xml b/pom.xml
index 69db6c9a7f..c4137f97f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-parent</artifactId>
-  <version>5.18.0-SNAPSHOT</version>
+  <version>5.19.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>
@@ -31,24 +31,23 @@
     <spring-security.version>4.2.18.RELEASE</spring-security.version>               <!-- checked 2020-08, further upgrade possible -->
     <spring-security-oauth2.version>2.5.0.RELEASE</spring-security-oauth2.version>  <!-- checked 2020-08 -->
     <spring-cloud.version>1.1.3.RELEASE</spring-cloud.version>
-	<hibernate.version>5.0.7.Final</hibernate.version>
+	<hibernate.version>5.1.17.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>
 	<unitils.version>3.4.6</unitils.version>
     <hsqldb.version>2.5.1</hsqldb.version>
-	<!-- <hsqldb.version>1.8.0.10</hsqldb.version>  -->
-	<!-- 1.8.0.10, 1.9.0-rc6 (manually build only for debugging) -->
     <httpcomponents.version>4.5.12</httpcomponents.version>
     <doxia.version>1.9.1</doxia.version>                <!-- checked 2020-08 -->
     <poi.version>4.1.2</poi.version>                    <!-- checked 2020-08 -->
     <jackson.version>2.11.2</jackson.version>           <!-- checked 2020-08 -->
 	<commons-logging.version>1.2</commons-logging.version> <!-- checked 2020-08 -->
 	<slf4j.version>1.7.30</slf4j.version>               <!-- checked 2020-08 -->
-	<jaxb.version>2.2.11</jaxb.version>                 <!-- checked 2020-08, there is a newer version 3.0.0-MX, not checked if compatible -->
+	<jaxb.version>2.3.3</jaxb.version>                 <!-- checked 2020-08, there is a newer version 3.0.0-MX, not checked if compatible -->
 	<cglib.version>3.3.0</cglib.version>
 	<aspectj.version>1.9.6</aspectj.version>            <!-- checked 2020-08 -->
 	<geotools.version>23.2</geotools.version>           <!-- checked 2020-08 -->
+    
     <javadoc.opts>-Xdoclint:none</javadoc.opts>         
   </properties>
   
@@ -251,7 +250,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M4</version>
+        <version>3.0.0-M5</version>  <!-- updated 2020-09 -->
         <configuration>
           <argLine>-Xmx512M -Dfile.encoding=${project.build.sourceEncoding}</argLine>
           <runOrder>alphabetical</runOrder>
@@ -519,7 +518,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.7</version>
+          <version>3.0.0</version>
         </plugin>
       </plugins>  
     </pluginManagement>
@@ -625,12 +624,10 @@
   <!-- **** DEPENDENCIES **** -->
   <dependencies>
     <dependency>
+      <!-- junit is required for all module tests, also those not depending on cdmlib-test, so it is added here on parent level with test scope -->
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <dependencyManagement>
@@ -685,82 +682,50 @@
         <artifactId>cdmlib-print</artifactId>
         <version>${project.version}</version>
       </dependency>
+      
       <!--*********** JAXB********* -->
       <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.3.1</version>
-        <!-- checked 2020-08 -->
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>${jaxb.version}</version>  <!-- not sure if jaxb.version is always the same -->
       </dependency>
+<!--       <dependency> -->
+<!--         replaced by jakarta.xml.bind-api -->
+<!--         <groupId>javax.xml.bind</groupId> -->
+<!--         <artifactId>jaxb-api</artifactId> -->
+<!--         <version>2.3.1</version> -->
+<!--         checked 2020-08 -->
+<!--       </dependency> -->
       <dependency>
          <!-- dependency for jaxb-api -->
          <groupId>javax.activation</groupId>
          <artifactId>javax.activation-api</artifactId>
          <version>1.2.0</version>
          <!-- checked 2020-08 -->
-      </dependency>
-      <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <version>1.2</version>
-        <!-- checked 2020-08 -->
-      </dependency>
-      <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1.1</version>
-        <!-- checked 2020-08 -->
       </dependency>
  	  <dependency>
 		<groupId>org.glassfish.jaxb</groupId>
 		<artifactId>jaxb-runtime</artifactId>
 		<version>${jaxb.version}</version>
 	  </dependency>
-	  <dependency>
-		<groupId>org.glassfish.jaxb</groupId>
-		<artifactId>jaxb-core</artifactId>
-		<version>${jaxb.version}</version>
-	  </dependency>
 	  <dependency>
 		<groupId>org.glassfish.jaxb</groupId>
 		<artifactId>jaxb-jxc</artifactId>
 		<version>${jaxb.version}</version>
 	  </dependency>
       <dependency>
-         <!-- jaxb-core dependency -->
-         <groupId>com.sun.istack</groupId>
-         <artifactId>istack-commons-runtime</artifactId>
-         <version>3.0.11</version>
-      </dependency>
-      <dependency>
-          <!-- jaxb-core dependency -->
-          <groupId>jakarta.xml.bind</groupId>
-          <artifactId>jakarta.xml.bind-api</artifactId>
-          <version>2.3.3</version>
-      </dependency>
-      <dependency>
-          <!-- jaxb-core dependency -->
-          <groupId>org.glassfish.jaxb</groupId>
-          <artifactId>txw2</artifactId>
-          <version>2.3.3</version>
+          <!-- currently required as xsom references older version -->
+          <groupId>com.sun.xml.bind.external</groupId>
+          <artifactId>relaxng-datatype</artifactId>
+          <version>${jaxb.version}</version>
       </dependency>
       <dependency>
-          <!-- jaxb-core transitive dependency -->
+          <!-- jaxb-runtime dependency -->
           <groupId>jakarta.activation</groupId>
           <artifactId>jakarta.activation-api</artifactId>
           <version>1.2.2</version>
       </dependency>
-      <dependency>
-          <!-- jaxb-jxc transitive dependency -->
-         <groupId>com.sun.xml.bind.external</groupId>
-         <artifactId>rngom</artifactId>
-         <version>2.3.3</version>
-      </dependency>
-      <dependency>
-          <groupId>com.sun.xml.bind.external</groupId>
-          <artifactId>relaxng-datatype</artifactId>
-          <version>2.3.3</version>
-      </dependency>
+      <!--  JAB END -->
       
 	  <dependency>
 	    <!-- only for version management org.apache.ant:ant depends in different versions from 
@@ -790,7 +755,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.13</version>
+        <version>4.13.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -905,6 +870,7 @@
 	  </dependency>
       <!-- ******* aspect ******* -->
       <dependency>
+        <!-- not really needed as long as aspectjweaver is on classpath which is a superset of aspectjrt -->
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjrt</artifactId>
         <version>${aspectj.version}</version>
@@ -915,6 +881,13 @@
         <version>${aspectj.version}</version>
       </dependency>
       <!-- ******* VARIOUS ******* -->
+      <dependency>
+        <groupId>xml-resolver</groupId>
+        <artifactId>xml-resolver</artifactId>
+        <version>1.2</version>
+        <!-- checked 2020-08 -->
+      </dependency>
+      
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
@@ -926,21 +899,22 @@
         <version>2.3</version>
       </dependency>
       <dependency>
-        <!-- TODO what is this for? -->
-        <groupId>org.eclipse</groupId>
-        <artifactId>osgi</artifactId>
-        <version>3.6.0</version>
-      </dependency>
-      <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib</artifactId>
-        <version>${cglib.version}</version>
+        <groupId>org.osgi</groupId>
+        <artifactId>osgi.core</artifactId>
+        <version>7.0.0</version>
       </dependency>
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib-nodep</artifactId>
         <version>${cglib.version}</version>
       </dependency>
+      <!-- <dependency> -->
+      <!-- we try to have only dependencies to cglib-nodep to reduce size and to avoid
+           having 2 similar libraries. #9206  -->
+<!--         <groupId>cglib</groupId> -->
+<!--         <artifactId>cglib</artifactId> -->
+<!--         <version>${cglib.version}</version> -->
+<!--       </dependency> -->
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
@@ -986,7 +960,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.14</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 
@@ -998,20 +972,20 @@
         <version>${commons-logging.version}</version>
       </dependency>
       <!-- only for version management, hibernate-commons-annotations:4.0.1.Final 
-        requires 3.1.0.CR2 , hibernate-ehcache:4.1.10 requires 3.1.0.GA , so we update 
-        here to the latest version 3.1.3.GA -->
+        requires 3.1.0.CR2 , so we update 
+        here to the latest version 3.4.1.Final -->
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging</artifactId>
         <version>3.4.1.Final</version>
         <!-- checked 2020-08 -->
       </dependency>
-	  <dependency>
-	    <!-- since hibernate 5.0.4 Dialect throws exception if jta is missing  -->
-        <groupId>javax.transaction</groupId>
-        <artifactId>jta</artifactId>
-        <version>1.1</version>
-      </dependency>  
+<!-- 	  <dependency> -->
+<!-- 	    see note in cdmib-persistence pom  -->
+<!--         <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 -->
@@ -1076,6 +1050,12 @@
         <artifactId>ooxml-schemas</artifactId>
         <version>1.4</version>
       </dependency>
+      <!--       <dependency> -->
+<!-- maybe needed in cdmlib-io, see https://poi.apache.org/help/faq.html  question 3 on when to use ooxml-schemas and when poi-ooxml-schemas  -->
+<!--         <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 -->
@@ -1200,18 +1180,17 @@
       </dependency>
       <dependency>
         <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache-core</artifactId>
-        <version>2.6.11</version>
+        <artifactId>ehcache</artifactId>
+        <version>2.10.6</version>
       </dependency>
       <!-- ******* XML ******* -->
       <dependency>
+<!--        xml-apis seems to be ALMOST fully included in java8 but ElementTraversal seems to be missing, therefore SDDDocumentBuilder does not compile -->
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
-        <!-- 
-            WARNING: do not upgrade to later versions 2.0.x of xml-apis
-            since these are effectivly reloaded to the early beta version
-            1.0.b2
-        -->
+<!--             WARNING: do not upgrade to later versions 2.0.x of xml-apis -->
+<!--             since these are effectivly reloaded to the early beta version -->
+<!--             1.0.b2 -->
         <version>1.4.01</version>
       </dependency>
       <dependency>
@@ -1222,38 +1201,15 @@
       </dependency>
       <!-- >batik-ext required by Xerces 2.11.0 for class ElementTraversal, 
         as this is not included anymore in xml-apis 2.x -->
-      <dependency>
-        <groupId>org.apache.xmlgraphics</groupId>
-        <artifactId>batik-ext</artifactId>
-        <version>1.13</version>
-      </dependency>
+<!--       <dependency> -->
+<!--         <groupId>org.apache.xmlgraphics</groupId> -->
+<!--         <artifactId>batik-ext</artifactId> -->
+<!--         <version>1.13</version> -->
+<!--       </dependency> -->
       <dependency> <!-- required by cdmlib-print -->
         <groupId>org.apache.xmlgraphics</groupId>
         <artifactId>fop</artifactId>
-        <!-- version 1.1 does NOT work, because it depends on avalon-framework-api 
-          4.2.0 which is not available in central maven repository under the given 
-          groupID -->
         <version>2.5</version>
-        <exclusions>
-          <!-- 1.1 depends on an old version of avalon-framework which does 
-            not exist in mvn repository under this groupId (has old groupId) -->
-          <exclusion>
-            <groupId>org.apache.avalon.framework</groupId>
-            <artifactId>avalon-framework-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.avalon.framework</groupId>
-            <artifactId>avalon-framework-impl</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <!-- not directly required, but fix mentioned to force correct version 
-        number 4.3.1. Required by org.apache.xmlgraphics/fop 1.1 Remove when dependency 
-        in fop in corrected. -->
-      <dependency>
-        <groupId>org.apache.avalon.framework</groupId>
-        <artifactId>avalon-framework-api</artifactId>
-        <version>4.3.1</version>
       </dependency>
       <dependency>
         <groupId>org.odftoolkit</groupId>
@@ -1281,7 +1237,7 @@
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
-        <version>1.4.12</version>
+        <version>1.4.14</version>
       </dependency>
       <dependency>
       <groupId>xmlpull</groupId>
@@ -1293,11 +1249,12 @@
         <artifactId>xpp3</artifactId>
         <version>1.1.4c</version>
       </dependency>
-      <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax</artifactId>
-        <version>1.2.0</version>
-      </dependency>
+<!--       <dependency> -->
+<!--        stax is part of java8 and therefore not needed anymore -->
+<!--         <groupId>stax</groupId> -->
+<!--         <artifactId>stax</artifactId> -->
+<!--         <version>1.2.0</version> -->
+<!--       </dependency> -->
       <dependency>
         <groupId>xom</groupId>
         <artifactId>xom</artifactId>
@@ -1345,11 +1302,6 @@
         <artifactId>hibernate-entitymanager</artifactId>
         <version>${hibernate.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-ehcache</artifactId>
-        <version>${hibernate.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-envers</artifactId>
@@ -1374,6 +1326,12 @@
         -->
         <version>0.9.5.2</version>
       </dependency>
+      <dependency>
+        <groupId>com.mchange</groupId>
+        <artifactId>mchange-commons-java</artifactId>
+        <!-- mchange-commons-java needs to match the version as defined in the c3p0/pom.xml -->
+        <version>0.2.11</version>
+      </dependency>
       <dependency>
         <groupId>org.hibernate.common</groupId>
         <artifactId>hibernate-commons-annotations</artifactId>
@@ -1394,11 +1352,6 @@
         <artifactId>javassist</artifactId>
         <version>3.27.0-GA</version>
       </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-cglib-repack</artifactId>
-        <version>2.1_3</version>
-      </dependency>
 
       <!-- ******* SPRING ******* -->
       <dependency>
@@ -1641,18 +1594,18 @@
       <dependency>
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
-         <version>42.2.15</version>
+         <version>42.2.18</version>
       </dependency>
 	  <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>
         <version>1.4.190</version>
       </dependency>
-      <!--for sqlserver2008 and sqlserver2005 -->
+      <!-- SQL Server -->
       <dependency>
         <groupId>com.microsoft.sqlserver</groupId>
-        <artifactId>jdbc4</artifactId>
-        <version>2.0</version>
+        <artifactId>mssql-jdbc</artifactId>
+        <version>8.4.1.jre8</version>
       </dependency>
 	  <dependency>
         <groupId>org.hsqldb</groupId>
@@ -1675,11 +1628,6 @@
         <artifactId>ojdbc</artifactId>
         <version>14</version>
         </dependency>   -->      
-      <dependency>
-        <groupId>com.taskadapter</groupId>
-        <artifactId>redmine-java-api</artifactId>
-        <version>3.1.0</version>
-      </dependency>
       <!-- GIS/KML -->
 	  <dependency>
 	     <groupId>de.micromata.jak</groupId>