From f7518ec78431c6ff27984a88fe7a3d9631aabfef Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Sun, 12 Dec 2021 11:57:06 +0100
Subject: update some more third-party libs

---
 eaaf-springboot-utils/pom.xml              | 11 +++++++++++
 eaaf_core_utils/pom.xml                    | 16 ++++++++++++++++
 eaaf_modules/eaaf_module_pvp2_core/pom.xml | 18 +++++++++++++++++-
 pom.xml                                    |  8 +++++++-
 4 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/eaaf-springboot-utils/pom.xml b/eaaf-springboot-utils/pom.xml
index ca60e1f1..a9d05417 100644
--- a/eaaf-springboot-utils/pom.xml
+++ b/eaaf-springboot-utils/pom.xml
@@ -59,6 +59,11 @@
       <artifactId>logback-access</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-to-slf4j</artifactId>       
+      <scope>provided</scope>
+    </dependency>    
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -85,6 +90,12 @@
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>      
      </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
diff --git a/eaaf_core_utils/pom.xml b/eaaf_core_utils/pom.xml
index 8b583e75..6ca82d9c 100644
--- a/eaaf_core_utils/pom.xml
+++ b/eaaf_core_utils/pom.xml
@@ -111,6 +111,12 @@
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
@@ -133,6 +139,16 @@
       <version>1.2.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>${junit-jupiter-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-migrationsupport</artifactId>
+      <version>${junit-jupiter-api.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
index 88fbd028..44bca828 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
@@ -102,6 +102,12 @@
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>xml-apis</groupId>
@@ -118,8 +124,18 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-core</artifactId>
       <scope>test</scope>
-    </dependency>  
+    </dependency>
 
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>${junit-jupiter-api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-migrationsupport</artifactId>
+      <version>${junit-jupiter-api.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/pom.xml b/pom.xml
index 45125208..9b7504b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
     <org.bouncycastle.bctls-jdk15to18.version>1.69</org.bouncycastle.bctls-jdk15to18.version>
 
     <org.slf4j.version>1.7.32</org.slf4j.version>
+    <log4j.version>2.15.0</log4j.version>
     <ch.qos.logback-access.version>1.2.3</ch.qos.logback-access.version>
     <commons-codec.version>1.15</commons-codec.version>
     <org.apache.commons-lang3.version>3.12.0</org.apache.commons-lang3.version>
@@ -85,7 +86,7 @@
 
     <!-- jUnit testing -->
     <surefire.version>2.22.1</surefire.version>
-    <junit-jupiter-api.version>5.7.1</junit-jupiter-api.version>
+    <junit-jupiter-api.version>5.8.2</junit-jupiter-api.version>
     <com.squareup.okhttp3.version>4.4.1</com.squareup.okhttp3.version>
     <org.powermock.version>2.0.9</org.powermock.version>
 
@@ -469,6 +470,11 @@
         <artifactId>slf4j-log4j12</artifactId>
         <version>${org.slf4j.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-to-slf4j</artifactId>      
+        <version>${log4j.version}</version>
+      </dependency>      
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-access</artifactId>
-- 
cgit v1.2.3