X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/29655c12de79f0d2acbee86dce89d2d4d23b78bd..cebc5b3a9749e725020fb55d5d22291f06c1be53:/pom.xml

diff --git a/pom.xml b/pom.xml
index bc6d8cb7db..c18b08e95c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,13 @@
     <module>cdmlib-test</module>
     <module>cdmlib-persistence</module>
     <module>cdmlib-services</module>
+    <module>cdmlib-cache</module>
     <module>cdmlib-ext</module>
     <module>cdmlib-io</module>
     <module>cdmlib-remote</module>
     <module>cdmlib-print</module>
     <module>cdmlib-remote-webapp</module>
-    <module>cdmlib-cache</module>
+
   </modules>
   <properties>    
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -30,17 +31,16 @@
     <java.codelevel>1.8</java.codelevel>
     <spring.version>4.3.30.RELEASE</spring.version>                                 <!-- checked 2020-08, further upgrade possible -->
     <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-security-oauth2.version>2.5.2.RELEASE</spring-security-oauth2.version>  <!-- checked 2020-08 -->
     <spring-cloud.version>1.1.3.RELEASE</spring-cloud.version>
 	<hibernate.version>5.4.33.Final</hibernate.version>
 	<hibernate-validator.version>6.2.3.Final</hibernate-validator.version>          <!-- checked 2020-08 -->
     <hibernate-search.version>5.11.10.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>
     <doxia.version>1.11.1</doxia.version>                <!-- checked 2021-12 -->
-    <poi.version>4.1.2</poi.version>                    <!-- checked 2020-08 -->
+    <poi.version>5.2.2</poi.version>                    <!-- checked 2022-06 -->
     <jackson.version>2.13.3</jackson.version>           <!-- checked 2022-05 -->
 	<commons-logging.version>1.2</commons-logging.version> <!-- checked 2022-06 -->
 	<slf4j.version>1.7.36</slf4j.version>               <!-- checked 2022-06 -->
@@ -49,7 +49,7 @@
 	<aspectj.version>1.9.7</aspectj.version>            <!-- checked 2022-05 -->
 	<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 -->
+    <jakarta.mail.version>1.5.6</jakarta.mail.version>      <!-- compatible to the one in spring-context-support/4.3.28.RELEASE -->
     <doclint>none</doclint>   
   </properties>
   
@@ -196,7 +196,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M5</version>  <!-- updated 2020-09 -->
+        <version>3.0.0-M7</version>  <!-- updated 2022-06 -->
         <configuration>
           <argLine>-Xmx512M -Dfile.encoding=${project.build.sourceEncoding}</argLine>
           <runOrder>alphabetical</runOrder>
@@ -408,7 +408,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>enforce</id>
@@ -696,8 +696,11 @@
         <version>${slf4j.version}</version>
       </dependency>
       <dependency>
+        <!-- replaces slf4j-log4j12 as log4j12 redirects to reload4j as log4j12 reached EOL 2015,
+             can maybe be removed once fully removing log4j12 (#10072), but not sure if it also
+             supports log4j2 -->
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
+        <artifactId>slf4j-reload4j</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
 	  <dependency>
@@ -871,6 +874,17 @@
         <artifactId>log4j</artifactId>
         <version>1.2.17</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-core</artifactId>
+        <version>2.18.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-api</artifactId>
+        <version>2.18.0</version>
+      </dependency>
+      
       <dependency>
         <groupId>net.sf.opencsv</groupId>
         <artifactId>opencsv</artifactId>
@@ -941,8 +955,6 @@
           <artifactId>checker-qual</artifactId>
           <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 -->
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
@@ -1035,18 +1047,29 @@
       </dependency>
       <dependency>
         <groupId>org.apache.poi</groupId>
-        <artifactId>poi-ooxml-schemas</artifactId>
+        <artifactId>poi-ooxml</artifactId>
         <version>${poi.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.poi</groupId>
-        <artifactId>poi-ooxml</artifactId>
+        <artifactId>poi-ooxml-lite</artifactId>
         <version>${poi.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.poi</groupId>
-        <artifactId>ooxml-schemas</artifactId>
-        <version>1.4</version>
+        <artifactId>poi-ooxml-full</artifactId>
+        <version>${poi.version}</version>
+      </dependency>
+      <dependency>
+        <!-- indirect poi-schema and doxia dependency -->
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-classworlds</artifactId>
+        <version>2.6.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-annotations</artifactId>
+        <version>2.1.1</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  -->
@@ -1055,24 +1078,21 @@
 <!--         <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.1.0</version>
+      	<version>5.0.3</version>
         <!-- checked 2020-08 -->
       </dependency>
       <dependency>
         <groupId>org.docx4j</groupId>
-        <artifactId>docx4j</artifactId>
-        <version>6.1.2</version>
+        <artifactId>docx4j-JAXB-Internal</artifactId>
+        <version>8.3.7</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 of guava and docx4j -->
+        <groupId>com.google.errorprone</groupId>
+        <artifactId>error_prone_annotations</artifactId>
+        <version>2.14.0</version>
       </dependency>
       <dependency>
         <!-- only for version management xalan depends in different versions from 
@@ -1205,7 +1225,7 @@
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache</artifactId>
-        <version>2.10.9.2</version>
+        <version>2.10.6</version>
       </dependency>
       <!-- ******* XML ******* -->
       <dependency>
@@ -1297,7 +1317,7 @@
       <dependency>
         <groupId>net.sf.saxon</groupId>
         <artifactId>Saxon-HE</artifactId>
-        <version>10.6</version>
+        <version>11.3</version>
       </dependency>
       <!-- ******* http components (ViBRANT)******* -->
       <dependency>
@@ -1367,23 +1387,25 @@
         <artifactId>hibernate-search-engine</artifactId>
         <version>${hibernate-search.version}</version>
       </dependency>
+
       <dependency>
-        <!-- TODO can be removed, not used anymore by hibernate, but still a dependency in 5.4.x -->
-        <groupId>org.javassist</groupId>
-        <artifactId>javassist</artifactId>
-        <version>3.29.0-GA</version>
-      </dependency>
-      <dependency>
+        <!-- used by hibernate as bytecode provider framework -->
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy</artifactId>
         <version>1.12.10</version>
       </dependency>
-      <!-- dependenc of hibernate-core and hibernate-search -->
+      <!-- dependency of hibernate-core -->
       <dependency>
         <groupId>org.jboss.spec.javax.transaction</groupId>
         <artifactId>jboss-transaction-api_1.2_spec</artifactId>
         <version>1.1.1.Final</version>
       </dependency>
+      <dependency>
+        <!-- dependency of iiif-apis (and still by hibernate but will be removed in v5.6 as hibernate uses bytebuddy)  -->
+        <groupId>org.javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <version>3.29.0-GA</version>
+      </dependency>
 
       <!-- ******* SPRING ******* -->
       <dependency>
@@ -1586,8 +1608,8 @@
         <!-- 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.4.1</version>
-        <!-- checked 2022-01 -->
+      	<version>3.4.2</version>
+        <!-- checked 2022-06 -->
       </dependency>
       <!-- swagger (rest service doc) -->
       <dependency>
@@ -1646,11 +1668,6 @@
         <groupId>com.microsoft.sqlserver</groupId>
         <artifactId>mssql-jdbc</artifactId>
         <version>9.4.1.jre8</version>
-      </dependency>
-	  <dependency>
-        <groupId>org.hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>${hsqldb.version}</version>
       </dependency>
       <dependency>
         <!-- SQL Server and Sybase -->
@@ -1704,7 +1721,7 @@
         <!-- Email functionality (used in cdmlib-services) -->
           <groupId>com.sun.mail</groupId>
           <artifactId>javax.mail</artifactId>
-          <version>${javax.mail.version}</version>
+          <version>${jakarta.mail.version}</version>
       </dependency>
       <dependency>
         <!-- only needed for PasswordResetService, may be replaced by Thymeleaf, but also needed in TaxEditor cdmlib modul -->