From cb6b1d73d1b6c3ec9b659a2c53727ffaeaa16573 Mon Sep 17 00:00:00 2001
From: "Zubcevic.com" <rene@zubcevic.com>
Date: Thu, 16 Dec 2021 15:41:39 +0100
Subject: [PATCH] upgrade to latest spring-boot libs and fixed related issues

---
 pom.xml                                                |  4 ++--
 webgoat-container/pom.xml                              | 10 ++++++++++
 .../org/owasp/webgoat/users/UserValidatorTest.java     |  2 +-
 .../webgoat/client_side_filtering/ShopEndpoint.java    |  2 ++
 webwolf/pom.xml                                        | 10 ++++++++++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff5eaa840..cbc888ee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.4</version>
+        <version>2.6.1</version>
     </parent>
 
     <name>WebGoat Parent Pom</name>
@@ -124,7 +124,6 @@
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <commons-io.version>2.6</commons-io.version>
         <guava.version>30.1-jre</guava.version>
-        <lombok.version>1.18.20</lombok.version>
         <wiremock.version>2.27.2</wiremock.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
@@ -133,6 +132,7 @@
         <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <java.version>17</java.version>
+        <thymeleaf.version>3.0.14.RELEASE</thymeleaf.version>
     </properties>
 
     <modules>
diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml
index f8f81365c..35e4645bd 100644
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@@ -51,6 +51,16 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
+           <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
diff --git a/webgoat-container/src/test/java/org/owasp/webgoat/users/UserValidatorTest.java b/webgoat-container/src/test/java/org/owasp/webgoat/users/UserValidatorTest.java
index 66ea4227e..d705b23d4 100644
--- a/webgoat-container/src/test/java/org/owasp/webgoat/users/UserValidatorTest.java
+++ b/webgoat-container/src/test/java/org/owasp/webgoat/users/UserValidatorTest.java
@@ -9,7 +9,7 @@ import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.Errors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
diff --git a/webgoat-lessons/client-side-filtering/src/main/java/org/owasp/webgoat/client_side_filtering/ShopEndpoint.java b/webgoat-lessons/client-side-filtering/src/main/java/org/owasp/webgoat/client_side_filtering/ShopEndpoint.java
index 470252ce5..283c0662d 100644
--- a/webgoat-lessons/client-side-filtering/src/main/java/org/owasp/webgoat/client_side_filtering/ShopEndpoint.java
+++ b/webgoat-lessons/client-side-filtering/src/main/java/org/owasp/webgoat/client_side_filtering/ShopEndpoint.java
@@ -23,8 +23,10 @@
 package org.owasp.webgoat.client_side_filtering;
 
 import com.beust.jcommander.internal.Lists;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/webwolf/pom.xml b/webwolf/pom.xml
index 5daf7dffd..8bb28bfe1 100644
--- a/webwolf/pom.xml
+++ b/webwolf/pom.xml
@@ -66,6 +66,16 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.retry</groupId>