From caa34a4972a12fe4867d54b3516e36c81ecf74e9 Mon Sep 17 00:00:00 2001
From: Sebastian Peters <Sebastian.Peters@gmail.com>
Date: Fri, 26 Jan 2024 12:50:20 +0100
Subject: [PATCH 1/4] Update log4j2 to 2.21.1

(cherry picked from commit fd2cf91601492a991048559190ae95b88e2c7ff6)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8323bc657..f68631e2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
         <freemarker.version>2.3.32</freemarker.version>
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <jackson.version>2.16.0</jackson.version>
-        <log4j2.version>2.20.0</log4j2.version>
+        <log4j2.version>2.21.1</log4j2.version>
         <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
         <mockito.version>5.8.0</mockito.version>
         <ognl.version>3.3.4</ognl.version>

From ade8af377236b396bac2f8c7ee77de8076266431 Mon Sep 17 00:00:00 2001
From: Sebastian Peters <Sebastian.Peters@gmail.com>
Date: Mon, 5 Feb 2024 11:28:36 +0100
Subject: [PATCH 2/4] [WW-5384] Update log4j2 to 2.22.1

and error_prone_annotations > 2.10.0 which depends on Java 11
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f68631e2f..00091d55d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
         <freemarker.version>2.3.32</freemarker.version>
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <jackson.version>2.16.0</jackson.version>
-        <log4j2.version>2.21.1</log4j2.version>
+        <log4j2.version>2.22.1</log4j2.version>
         <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
         <mockito.version>5.8.0</mockito.version>
         <ognl.version>3.3.4</ognl.version>

From f8fcdbde502b015705663ac21e0768ffc2e4a472 Mon Sep 17 00:00:00 2001
From: Sebastian Peters <Sebastian.Peters@gmail.com>
Date: Mon, 5 Feb 2024 14:15:31 +0100
Subject: [PATCH 3/4] [WW-5393] Update caffeine to 3.1.8

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 00091d55d..88ec4ee84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -633,7 +633,7 @@
             <dependency>
                 <groupId>com.github.ben-manes.caffeine</groupId>
                 <artifactId>caffeine</artifactId>
-                <version>2.9.3</version>
+                <version>3.1.8</version>
             </dependency>
 
             <dependency>

From d1413b01c0a47b51741f58b29185308c27044153 Mon Sep 17 00:00:00 2001
From: Sebastian Peters <Sebastian.Peters@gmail.com>
Date: Mon, 5 Feb 2024 14:19:45 +0100
Subject: [PATCH 4/4] Override version of error_prone_annotations

until caffeine updates from 2.10.0 to 2.23.0
---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 88ec4ee84..217a65b1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -636,6 +636,13 @@
                 <version>3.1.8</version>
             </dependency>
 
+            <!-- override version of error_prone_annotations until caffeine updates from 2.10.0 to 2.23.0 -->
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>2.23.0</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.framework</artifactId>