From 134b5a78d805a75895bd6d099397c7b6b5d093fb Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Fri, 1 Sep 2023 08:59:44 +0200
Subject: chore(core): update third-party libs to latest version and remove
 libs that we don't need any more

---
 eaaf_core/pom.xml |  4 ---
 pom.xml           | 87 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml
index 6a939710..34b50d20 100644
--- a/eaaf_core/pom.xml
+++ b/eaaf_core/pom.xml
@@ -98,10 +98,6 @@
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-engine-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>      
-    </dependency>
     <dependency>
       <groupId>org.owasp.encoder</groupId>
       <artifactId>encoder</artifactId>
diff --git a/pom.xml b/pom.xml
index 311d1954..5bd6f63d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,75 +46,77 @@
     <io.grpc-core.version>1.53.0</io.grpc-core.version>
 
     <!-- Other third-party libs -->
-    <spring-boot-starter-web.version>3.0.5</spring-boot-starter-web.version>
-    <org.springframework.version>6.0.8</org.springframework.version>
+    <spring-boot-starter-web.version>3.1.3</spring-boot-starter-web.version>
+    <org.springframework.version>6.0.11</org.springframework.version>
     <org.apache.tomcat.embed.version>10.1.13</org.apache.tomcat.embed.version>
     <org.opensaml.version>5.0.0-SNAPSHOT</org.opensaml.version>
-    <org.apache.santuario.xmlsec.version>2.3.2</org.apache.santuario.xmlsec.version>
-    <org.cryptacular.version>1.2.5</org.cryptacular.version>
-    <org.bouncycastle.bcprov-jdk18on.version>1.71.1</org.bouncycastle.bcprov-jdk18on.version>
+    <org.apache.santuario.xmlsec.version>3.0.2</org.apache.santuario.xmlsec.version>
+    <org.cryptacular.version>1.2.6</org.cryptacular.version>
+    <org.bouncycastle.bcprov-jdk18on.version>1.76</org.bouncycastle.bcprov-jdk18on.version>
+    <!-- currently, SSL Client authentication with re-recognition doesn't work with bctls-jdk18o > 1.71.1  -->
     <org.bouncycastle.bctls-jdk18on.version>1.71.1</org.bouncycastle.bctls-jdk18on.version>
 
     <org.slf4j.version>2.0.7</org.slf4j.version>
-    <log4j.version>2.19.0</log4j.version>
-    <ch.qos.logback.version>1.4.6</ch.qos.logback.version>
+    <log4j.version>2.20.0</log4j.version>
+    <ch.qos.logback.version>1.4.11</ch.qos.logback.version>
+    <org.owasp.encoder.version>1.2.3</org.owasp.encoder.version>    
     
-    <commons-codec.version>1.15</commons-codec.version>
-    <org.apache.commons-lang3.version>3.12.0</org.apache.commons-lang3.version>
+    <org.apache.commons-lang3.version>3.13.0</org.apache.commons-lang3.version>
     <org.apache.commons-text.version>1.10.0</org.apache.commons-text.version>
-    <org.apache.commons-collections>3.2.2</org.apache.commons-collections>
     <org.apache.commons-collections4>4.4</org.apache.commons-collections4>
     <commons-io.version>2.13.0</commons-io.version>
+    <commons-codec.version>1.16.0</commons-codec.version>
     <commons-fileupload2.version>2.0.0-M1</commons-fileupload2.version>
 
     <jakarta.servlet-api>6.0.0</jakarta.servlet-api>
-    
-    <org.apache.velocity.version>2.3</org.apache.velocity.version>
     <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
-    <joda-time.version>2.12.2</joda-time.version>
-    <jsr305.version>3.0.2</jsr305.version>
-    <com.google.guava.version>31.1-jre</com.google.guava.version>
-    <org.owasp.encoder.version>1.2.3</org.owasp.encoder.version>
 
+    <joda-time.version>2.12.5</joda-time.version>
+    <org.apache.velocity.version>2.3</org.apache.velocity.version>
+	<com.google.guava.version>32.1.2-jre</com.google.guava.version>
+	<org.bitbucket.b_c.jose4j.version>0.9.3</org.bitbucket.b_c.jose4j.version>
+    
+    <jsr305.version>3.0.2</jsr305.version>
+    
     <httpclient.version>5.2.1</httpclient.version>
 
-    <com.fasterxml.jackson.core.version>2.15.0</com.fasterxml.jackson.core.version>
-    <com.fasterxml.jackson.databind.version>2.15.0</com.fasterxml.jackson.databind.version>
+    <com.fasterxml.jackson.core.version>2.15.2</com.fasterxml.jackson.core.version>
+    <com.fasterxml.jackson.databind.version>2.15.2</com.fasterxml.jackson.databind.version>
     <gson.version>2.10.1</gson.version>
-    <org.bitbucket.b_c.jose4j.version>0.9.3</org.bitbucket.b_c.jose4j.version>
-
+       
     <jaxen.jaxen.version>1.2.0</jaxen.jaxen.version>
     <xerces.version>2.12.2</xerces.version>
     <xalan.version>2.7.1</xalan.version>
 
     <woodstox-core.version>6.5.1</woodstox-core.version>
-    <snakeyaml.version>1.33</snakeyaml.version>
+    <snakeyaml.version>2.2</snakeyaml.version>
 
     <!-- jUnit testing -->
-    <surefire.version>3.0.0</surefire.version>
-    <junit-jupiter-api.version>5.8.2</junit-jupiter-api.version>
-    <mockito-junit-jupiter.version>4.9.0</mockito-junit-jupiter.version>
-    <com.squareup.okhttp3.version>4.9.3</com.squareup.okhttp3.version>
+    <surefire.version>3.1.2</surefire.version>
+    <junit-jupiter-api.version>5.10.0</junit-jupiter-api.version>
+    <mockito-junit-jupiter.version>5.5.0</mockito-junit-jupiter.version>
+    <com.squareup.okhttp3.version>4.11.0</com.squareup.okhttp3.version>
+    <com.squareup.okio.version>3.5.0</com.squareup.okio.version>
     <org.powermock.version>2.0.9</org.powermock.version>
 
     <!-- Code helper plug-ins -->
-    <org.projectlombok.lombok.version>1.18.26</org.projectlombok.lombok.version>
+    <org.projectlombok.lombok.version>1.18.28</org.projectlombok.lombok.version>
 
     <!-- Code quality checks -->
     <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
-    <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-    <maven-pmd-plugin.version>3.14.0</maven-pmd-plugin.version>
-    <spotbugs-maven-plugin.version>4.7.3.4</spotbugs-maven-plugin.version>
-    <findsecbugs-plugin.version>1.11.0</findsecbugs-plugin.version>
-    <dependency-check-maven.version>6.0.3</dependency-check-maven.version>
+    <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
+    <maven-pmd-plugin.version>3.21.0</maven-pmd-plugin.version>
+    <spotbugs-maven-plugin.version>4.7.3.5</spotbugs-maven-plugin.version>
+    <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
+    <dependency-check-maven.version>8.4.0</dependency-check-maven.version>
 
     <!-- Compile and deploy plugins -->    
-    <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
-    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-    <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-    <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-    <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-    <wagon-ssh.version>3.4.3</wagon-ssh.version>
+    <versions-maven-plugin.version>2.16.0</versions-maven-plugin.version>
+    <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+    <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+    <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
+    <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
+    <wagon-ssh.version>3.5.3</wagon-ssh.version>
 
     <license.outputDirectory>${project.build.directory}/thirdparty_licenses</license.outputDirectory>
     <pmw_rules_location>https://apps.egiz.gv.at/checkstyle/egiz_pmd_checks.xml</pmw_rules_location>
@@ -463,11 +465,6 @@
     	<artifactId>jakarta.annotation-api</artifactId>
     	<version>${jakarta.annotation-api.version}</version>
 	  </dependency>
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>${org.apache.commons-collections}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-collections4</artifactId>
@@ -743,6 +740,12 @@
         <version>${com.squareup.okhttp3.version}</version>
         <scope>test</scope>
       </dependency>
+	  <dependency>
+    	<groupId>com.squareup.okio</groupId>
+    	<artifactId>okio</artifactId>
+    	<version>${com.squareup.okio.version}</version>
+    	<scope>test</scope>
+      </dependency>      
       <dependency>
         <groupId>at.gv.egiz.eaaf</groupId>
         <artifactId>eaaf_core_utils</artifactId>
-- 
cgit v1.2.3