From ce7868b96f4fdfa26817a1e01ea2951f8a8ce021 Mon Sep 17 00:00:00 2001
From: Thijs Mesman <thijs.mesman@42.nl>
Date: Tue, 29 Jul 2025 10:04:06 +0200
Subject: [PATCH] update dependencies, remove owasp supressions and override
 commons.lang dependency

---
 .github/workflows/maven.yml |  2 +-
 owasp-suppressions.xml      | 13 +------------
 pom.xml                     | 26 +++++++++++++++++++-------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1ec4d5a..99b2d28 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -13,5 +13,5 @@ jobs:
   call-workflow:
     uses: 42BV/42-github-workflows/.github/workflows/maven-test.yml@main
     with:
-      java-version: 17
+      java-version: 21
     secrets: inherit
diff --git a/owasp-suppressions.xml b/owasp-suppressions.xml
index 292d59f..5aecb74 100644
--- a/owasp-suppressions.xml
+++ b/owasp-suppressions.xml
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
-    <suppress>
-        <notes>Remove when spring updates</notes>
-        <cve>CVE-2022-45688</cve>
-        <cve>CVE-2023-5072</cve>
-        <cve>CVE-2023-35116</cve>
-        <cve>CVE-2024-22233</cve>
-        <cve>CVE-2024-22234</cve>
-        <cve>CVE-2024-22257</cve>
-        <cve>CVE-2024-22243</cve>
-        <cve>CVE-2024-22233</cve>
-        <cve>CVE-2024-22233</cve>
-    </suppress>
+
 </suppressions>
diff --git a/pom.xml b/pom.xml
index 9ff1e9e..903d4a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,15 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
 
-        <spring.boot.version>3.4.0</spring.boot.version>
+        <spring.boot.version>3.5.4</spring.boot.version>
         <beanmapper.spring.version>6.0.0</beanmapper.spring.version>
+        <commons.lang.version>3.18.0</commons.lang.version>
+        <dependency-check-maven.version>12.1.3</dependency-check-maven.version>
+        <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
+        <central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
+        <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
+        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
     </properties>
 
     <dependencies>
@@ -90,6 +97,11 @@
             <artifactId>beanmapper-spring</artifactId>
             <version>${beanmapper.spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons.lang.version}</version>
+        </dependency>
 
         <!-- TEST dependencies -->
         <dependency>
@@ -127,7 +139,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>${maven-javadoc-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -141,7 +153,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>${maven-source-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -155,7 +167,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.2.7</version>
+                <version>${maven-gpg-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -170,7 +182,7 @@
             <plugin>
                 <groupId>org.sonatype.central</groupId>
                 <artifactId>central-publishing-maven-plugin</artifactId>
-                <version>0.7.0</version>
+                <version>${central-publishing-maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <publishingServerId>central</publishingServerId>
@@ -180,7 +192,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.12</version>
+                <version>${jacoco-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -200,7 +212,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>11.1.0</version>
+                <version>${dependency-check-maven.version}</version>
                 <configuration>
                     <failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>
                     <skipProvidedScope>true</skipProvidedScope>