updating poms for branch'release/5.40.0' with non-snapshot versions

[cdm-server.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 435484554bea6e0bc92c121763e859d89932d862..5cad5a453f36fdd4c355177a9c80783a0bff00b8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdm-server</artifactId>
-  <version>5.32.0-SNAPSHOT</version>
+  <version>5.40.0</version>
   <packaging>jar</packaging>
   <name>CDM Community Standalone Server</name>
 
@@ -12,6 +12,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jetty-version>9.4.26.v20200117</jetty-version>
     <doclint>none</doclint>
+    <log4j.version>2.19.0</log4j.version>
+    <slf4j.version>1.7.36</slf4j.version>
   </properties>
 
   <scm>
@@ -238,7 +240,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.18.1</version>
+        <version>3.0.0-M7</version>
         <configuration>
           <argLine>-Xmx512M</argLine>
           <includes>
@@ -500,7 +502,6 @@
                 -->
              </image>
            </images>
-
         </configuration>
 
         <!-- Connect start/stop to pre- and
@@ -656,6 +657,15 @@
     </repository>
   </distributionManagement>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <!-- maven 3 no longer supports uniqueVersions for SNAPSHOT artifacts. 
       The cdm-server Bootlader however relies on a specific name of the cdm-webapp 
@@ -680,6 +690,14 @@
         <artifactId>jetty-webapp-logging</artifactId>
         <version>9.4.20.v20190813</version><!-- versioning independent of jetty core -->
         <type>pom</type><!-- we only need the dependencies like jul-to-slf4j managed in this pom! -->
+        <!-- this is for log4j12 ,el-api
+         still need to check if this is really needed by jetty 
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+          </exclusion>
+        </exclusions> -->
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -713,16 +731,12 @@
       <version>${jetty-version}</version>
       <type>pom</type>
     </dependency>
-    <dependency>
-        <groupId>javax.el</groupId>
-        <artifactId>javax.el-api</artifactId>
-        <version>3.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.web</groupId>
-      <artifactId>el-impl</artifactId>
-      <version>2.2</version>
-    </dependency>
+ <!--   <dependency>
+       <groupId>jakarta.el</groupId>
+       <artifactId>jakarta.el-api</artifactId>
+       <version>4.0.0</version>
+    </dependency>   -->
+
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>jta</artifactId>
@@ -747,13 +761,26 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.32</version>
     </dependency>
+    <!-- move all logging to log4j 2-->
+    <!-- <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>  -->
+    <!-- move all log4j2 logging to the current slf4j implementor,
+         !!! never use together with log4j-slf4j-impl on classpath => endless circle -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.32</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-to-slf4j</artifactId>
+      <version>${log4j.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
@@ -765,7 +792,7 @@
       <version>2.11.0</version>
     </dependency>
     <dependency>
-      <!-- only used in InstanceManger class -->
+      <!-- only used in InstanceManager class -->
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
       <version>4.4</version>