From 71f4304533bd49207d39dbd0ae568b5f3f4aa9f3 Mon Sep 17 00:00:00 2001
From: "Piotr P. Karwasz" <piotr.github@karwasz.org>
Date: Fri, 15 Mar 2024 20:03:15 +0100
Subject: [PATCH] Upgrade `log4j-api` to version `2.23.1` (#230)

* Bump log4j2.version from 2.22.1 to 2.23.1

Bumps `log4j2.version` from 2.22.1 to 2.23.1.

Updates `org.apache.logging.log4j:log4j-api` from 2.22.1 to 2.23.1

Updates `org.apache.logging.log4j:log4j-core` from 2.22.1 to 2.23.1

Updates `org.apache.logging.log4j:log4j-core-test` from 2.22.1 to 2.23.1

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.apache.logging.log4j:log4j-core-test
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Ban `spring-jcl` from the dependencies

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3f2865c..07dad4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -434,6 +434,33 @@ under the License.
               </plugins>
           </configuration>
       </plugin>
+
+      <!--
+        ~ Ban Commons Logging clones
+        -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>ban-jcl-clones</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <excludes>
+                    <exclude>org.slf4j:jcl-over-slf4j</exclude>
+                    <exclude>org.springframework:spring-jcl</exclude>
+                  </excludes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 
@@ -491,6 +518,13 @@ under the License.
       <artifactId>log4j-core-test</artifactId>
       <version>${log4j2.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <!-- Commons Logging clone -->
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-jcl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -582,7 +616,7 @@ under the License.
     <commons.failsafe.version>3.2.1</commons.failsafe.version>
     <!-- Allow default test run order to be changed -->
     <failsafe.runorder>filesystem</failsafe.runorder>
-    <log4j2.version>2.22.1</log4j2.version>
+    <log4j2.version>2.23.1</log4j2.version>
     <logback.version>1.3.12</logback.version>
     <slf4j.version>2.0.12</slf4j.version>
     <findsecbugs.version>1.13.0</findsecbugs.version>