From 72af4526d495d7da71f4837193f5e051afb48872 Mon Sep 17 00:00:00 2001
From: Dennis Kieselhorst <mail@dekies.de>
Date: Mon, 9 Sep 2024 10:17:10 +0200
Subject: [PATCH] chore(deps): Update Log4J dependencies to 2.24.0

---
 .github/dependabot.yml                                      | 6 ++++++
 .../src/main/resources/archetype-resources/build.gradle     | 6 +++---
 .../src/main/resources/archetype-resources/pom.xml          | 2 +-
 .../src/main/resources/archetype-resources/build.gradle     | 6 +++---
 .../src/main/resources/archetype-resources/pom.xml          | 2 +-
 samples/spring/pet-store/build.gradle                       | 6 +++---
 samples/spring/pet-store/pom.xml                            | 2 +-
 samples/struts/pet-store/build.gradle                       | 4 ++--
 samples/struts/pet-store/pom.xml                            | 2 +-
 9 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index cc36223dc..96dd4d8b3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,6 +18,9 @@ updates:
       slf4j:
         patterns:
           - "org.slf4j:*"
+      log4j:
+        patterns:
+          - "org.apache.logging.log4j:*"
       junit:
         patterns:
           - "org.junit:*"
@@ -40,5 +43,8 @@ updates:
       slf4j:
         patterns:
           - "org.slf4j:*"
+      log4j:
+        patterns:
+          - "org.apache.logging.log4j:*"
     schedule:
       interval: "weekly"
\ No newline at end of file
diff --git a/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle
index daaf61428..bc675d8f1 100644
--- a/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle
+++ b/aws-serverless-spring-archetype/src/main/resources/archetype-resources/build.gradle
@@ -10,9 +10,9 @@ dependencies {
           'org.springframework:spring-webmvc:6.1.12',
           'org.springframework:spring-context:6.1.12',
           'com.amazonaws.serverless:aws-serverless-java-container-spring:[2.0-SNAPSHOT,)',
-          'org.apache.logging.log4j:log4j-core:2.23.1',
-          'org.apache.logging.log4j:log4j-api:2.23.1',
-          'org.apache.logging.log4j:log4j-slf4j-impl:2.23.1',
+          'org.apache.logging.log4j:log4j-core:2.24.0',
+          'org.apache.logging.log4j:log4j-api:2.24.0',
+          'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0',
           'com.fasterxml.jackson.core:jackson-databind:2.17.2',
           'com.amazonaws:aws-lambda-java-log4j2:1.6.0',
   )
diff --git a/aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml
index 759b3ad27..4860c66e8 100644
--- a/aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/aws-serverless-spring-archetype/src/main/resources/archetype-resources/pom.xml
@@ -18,7 +18,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <spring.version>6.1.12</spring.version>
         <junit.version>5.11.0</junit.version>
-        <log4j.version>2.23.1</log4j.version>
+        <log4j.version>2.24.0</log4j.version>
     </properties>
 
     <dependencies>
diff --git a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle
index 8d96159a7..64b609527 100644
--- a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle
+++ b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/build.gradle
@@ -36,9 +36,9 @@ dependencies {
   implementation ('org.hibernate.validator:hibernate-validator:6.1.7.Final')
   implementation ('com.fasterxml.jackson.core:jackson-databind:2.17.2')
   implementation ('com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.2')
-  implementation ('org.apache.logging.log4j:log4j-core:2.23.1')
-  implementation ('org.apache.logging.log4j:log4j-api:2.23.1')
-  implementation ('org.apache.logging.log4j:log4j-slf4j-impl:2.23.1')
+  implementation ('org.apache.logging.log4j:log4j-core:2.24.0')
+  implementation ('org.apache.logging.log4j:log4j-api:2.24.0')
+  implementation ('org.apache.logging.log4j:log4j-slf4j-impl:2.24.0')
   implementation ('com.amazonaws:aws-lambda-java-log4j2:1.6.0')
 
   testImplementation("com.amazonaws.serverless:aws-serverless-java-container-core:[2.0-SNAPSHOT,):tests")
diff --git a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml
index 5803bd2e6..5c1c2987d 100644
--- a/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/aws-serverless-struts-archetype/src/main/resources/archetype-resources/pom.xml
@@ -18,7 +18,7 @@
         <struts.version>7.0.0-M8</struts.version>
         <jackson.version>2.17.2</jackson.version>
         <junit.version>5.11.0</junit.version>
-        <log4j.version>2.23.1</log4j.version>
+        <log4j.version>2.24.0</log4j.version>
     </properties>
 
     <dependencies>
diff --git a/samples/spring/pet-store/build.gradle b/samples/spring/pet-store/build.gradle
index 796b98c29..2b3e01a95 100644
--- a/samples/spring/pet-store/build.gradle
+++ b/samples/spring/pet-store/build.gradle
@@ -10,9 +10,9 @@ dependencies {
           'org.springframework:spring-webmvc:6.1.12',
           'org.springframework:spring-context:6.1.12',
           'com.amazonaws.serverless:aws-serverless-java-container-spring:[2.0-SNAPSHOT,)',
-          'org.apache.logging.log4j:log4j-core:2.23.1',
-          'org.apache.logging.log4j:log4j-api:2.23.1',
-          'org.apache.logging.log4j:log4j-slf4j-impl:2.23.1',
+          'org.apache.logging.log4j:log4j-core:2.24.0',
+          'org.apache.logging.log4j:log4j-api:2.24.0',
+          'org.apache.logging.log4j:log4j-slf4j-impl:2.24.0',
           'com.fasterxml.jackson.core:jackson-databind:2.17.2',
           'com.amazonaws:aws-lambda-java-log4j2:1.6.0',
   )
diff --git a/samples/spring/pet-store/pom.xml b/samples/spring/pet-store/pom.xml
index 6cc5a2c4b..2949da8d9 100644
--- a/samples/spring/pet-store/pom.xml
+++ b/samples/spring/pet-store/pom.xml
@@ -25,7 +25,7 @@
 
     <properties>
         <spring.version>6.1.12</spring.version>
-        <log4j.version>2.23.1</log4j.version>
+        <log4j.version>2.24.0</log4j.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
     </properties>
diff --git a/samples/struts/pet-store/build.gradle b/samples/struts/pet-store/build.gradle
index 5fdd43e54..56deb9a5d 100644
--- a/samples/struts/pet-store/build.gradle
+++ b/samples/struts/pet-store/build.gradle
@@ -24,8 +24,8 @@ dependencies {
           'jakarta.el:jakarta.el-api:5.0.1',
           'com.fasterxml.jackson.core:jackson-databind:2.17.2',
           'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.2',
-          'org.apache.logging.log4j:log4j-core:2.23.1',
-          'org.apache.logging.log4j:log4j-api:2.23.1',
+          'org.apache.logging.log4j:log4j-core:2.24.0',
+          'org.apache.logging.log4j:log4j-api:2.24.0',
           'com.amazonaws:aws-lambda-java-log4j2:1.6.0',
   )
 }
diff --git a/samples/struts/pet-store/pom.xml b/samples/struts/pet-store/pom.xml
index 9c466a3a5..8e3f7f13f 100644
--- a/samples/struts/pet-store/pom.xml
+++ b/samples/struts/pet-store/pom.xml
@@ -29,7 +29,7 @@
         <struts.version>7.0.0-M8</struts.version>
         <jackson.version>2.17.2</jackson.version>
         <junit.version>4.13.2</junit.version>
-        <log4j.version>2.23.1</log4j.version>
+        <log4j.version>2.24.0</log4j.version>
     </properties>
 
     <dependencies>