cleanup

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 615aaafd80ac178e97b3cbbb8ad1c25f8a6cd11b..a70aac7aeb99e268f9fae5f014581c5b8ee08401 100644 (file)
--- 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.32.0-SNAPSHOT</version>
+  <version>5.43.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.org/cdmlib/</url>
@@ -43,7 +43,7 @@
     <jackson.version>2.13.3</jackson.version>           <!-- checked 2022-05 -->
        <!-- CAUTION when upgrading, 1.8x requires another log4j binding: https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/index.html -->
     <slf4j.version>1.7.36</slf4j.version>               <!-- checked 2022-06 -->
-       <log4j.version>2.18.0</log4j.version>
+       <log4j.version>2.19.0</log4j.version>
        <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.7</aspectj.version>            <!-- checked 2022-05 -->
@@ -173,6 +173,7 @@
       <name>JBoss Repository</name>
       <url>https://repository.jboss.org</url>
     </repository>  -->
+    <!-- required for org.geotools:gt-opengis/gt-referencing/gt-epsg-wkt/gt-main -->    
     <repository>
        <id>OSGeo Repository</id>
        <url>https://repo.osgeo.org/repository/release/</url>
@@ -184,8 +185,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-               <!-- TODO #64077#9919 upgrading to 3.x leads to test failures in model etc. -->
-               <version>2.5.1</version> 
+               <!-- TODO #6407#9919 upgrading to 3.x leads to test failures in model etc. -->
+    <!--   <version>3.10.1</version>  --> 
+        <version>2.5.1</version> 
         <configuration>
           <source>${java.codelevel}</source>
           <target>${java.codelevel}</target>
@@ -680,7 +682,7 @@
           <artifactId>jakarta.activation-api</artifactId>
           <version>1.2.2</version>
       </dependency>
-      <!--  JAB END -->
+      <!--  JAXB END -->
       
          <dependency>
            <!-- only for version management org.apache.ant:ant depends in different versions from 
@@ -699,12 +701,6 @@
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-slf4j-impl</artifactId>
         <version>${log4j.version}</version>
-      </dependency>
-         <dependency>
-        <!-- try to generally exclude -nop as we try to use log4j12, this is done already for unitils -->
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-nop</artifactId>
-        <version>${slf4j.version}</version>
       </dependency>
       <!-- dozer depends on jcl-over-slf4j -->
       <dependency>
@@ -712,6 +708,7 @@
         <artifactId>jcl-over-slf4j</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
+      
       <!-- ******* testing ******* -->
       <dependency>
         <groupId>junit</groupId>
@@ -762,6 +759,7 @@
             <artifactId>hibernate</artifactId>
           </exclusion>
           <exclusion>
+            <!-- we use log4j-slf4j-impl -->
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-nop</artifactId>
           </exclusion>
@@ -1270,17 +1268,17 @@
         <version>2.12.2</version>
         <!-- checked 2022-06 -->
       </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> <!-- required by cdmlib-print -->
         <groupId>org.apache.xmlgraphics</groupId>
         <artifactId>fop</artifactId>
         <version>2.7</version>
+        <exclusions>
+          <exclusion>
+            <!-- we use jcl-over-slf4j instead -->
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.odftoolkit</groupId>
@@ -1684,12 +1682,12 @@
       <dependency>
         <groupId>org.mariadb.jdbc</groupId>
         <artifactId>mariadb-java-client</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
       </dependency>
       <dependency>
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
-         <version>42.3.6</version>
+         <version>42.5.1</version>
       </dependency>
          <dependency>
         <groupId>com.h2database</groupId>
@@ -1760,7 +1758,7 @@
         <!-- only needed for PasswordResetService, may be replaced by Thymeleaf, but also needed in TaxEditor cdmlib modul -->
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-text</artifactId>
-        <version>1.9</version>
+        <version>1.10.0</version>
       </dependency>
       <dependency>
         <groupId>org.passay</groupId>