From d7d3b7d6268698652e52c7e92ca6535972715ba3 Mon Sep 17 00:00:00 2001
From: Erik Bruchez <erik@bruchez.org>
Date: Tue, 28 Dec 2021 15:58:52 -0800
Subject: [PATCH] Update log4j to 2.17.1

---
 build.sbt |  2 +-
 build.xml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.sbt b/build.sbt
index e6be08aaa1..c41a4dc640 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,7 +17,7 @@ val ServletApiVersion             = "3.0.1"
 val PortletApiVersion             = "2.0"
 val Slf4jVersion                  = "1.7.25"
 val HttpComponentsVersion         = "4.3.5"  // 4.5.2
-val Log4j2Version                 = "2.17.0"
+val Log4j2Version                 = "2.17.1"
 val CommonsIoVersion              = "2.0.1"  // 2.5
 val EnumeratumVersion             = "1.5.6"
 val AutowireVersion               = "0.2.6"
diff --git a/build.xml b/build.xml
index 0c2f14e225..876cac9a29 100644
--- a/build.xml
+++ b/build.xml
@@ -151,7 +151,7 @@
             -forceprocessing
 
             -injars      orbeon-war/jvm/target/webapp/WEB-INF/lib/(!slf4j-api-1.7.25.jar,!bcmail-*.jar,!bcprov-*.jar,!bcpkix-*.jar,!openpdf-*.jar,!log4j-api-*.jar,**.jar;)
-            -injars      orbeon-war/jvm/target/webapp/WEB-INF/lib/log4j-api-2.17.0.jar(!META-INF/versions/9/**.class)
+            -injars      orbeon-war/jvm/target/webapp/WEB-INF/lib/log4j-api-2.17.1.jar(!META-INF/versions/9/**.class)
             -outjars     ${temp.jar}(**.class,!**)
 
             -libraryjars ${java.home}/lib/rt.jar
@@ -202,7 +202,7 @@
             -forceprocessing
 
             -injars      orbeon-war/jvm/target/webapp/WEB-INF/lib/(!slf4j-api-1.7.25.jar,!bcmail-*.jar,!bcprov-*.jar,!bcpkix-*.jar,!openpdf-*.jar,!log4j-api-*.jar,**.jar;)
-            -injars      orbeon-war/jvm/target/webapp/WEB-INF/lib/log4j-api-2.17.0.jar(!META-INF/versions/9/**.class)
+            -injars      orbeon-war/jvm/target/webapp/WEB-INF/lib/log4j-api-2.17.1.jar(!META-INF/versions/9/**.class)
             -outjars     ${temp.jar}(**.class,!**)
 
             -libraryjars ${java.home}/lib/rt.jar
@@ -255,7 +255,7 @@
             -forceprocessing
 
             -injars      orbeon-war/jvm/target/webapp/WEB-INF/lib/(!slf4j-api-1.7.25.jar,!bcmail-*.jar,!bcprov-*.jar,!bcpkix-*.jar,!openpdf-*.jar,!log4j-api-*.jar,**.jar;)
-            -injars      orbeon-war/jvm/target/webapp/WEB-INF/lib/log4j-api-2.17.0.jar(!META-INF/versions/9/**.class)
+            -injars      orbeon-war/jvm/target/webapp/WEB-INF/lib/log4j-api-2.17.1.jar(!META-INF/versions/9/**.class)
             -outjars     ${temp.jar}(**.class,!**)
 
             -libraryjars ${java.home}/lib/rt.jar
@@ -358,10 +358,10 @@
                 <include name="orbeon-proxy-portlet.jar"/>
             </lib>
             <lib dir="orbeon-war/jvm/target/webapp/WEB-INF/lib">
-                <include name="slf4j-api-1.7.25.jar"/>
-                <include name="log4j-slf4j-impl-2.17.0.jar"/>
-                <include name="log4j-api-2.17.0.jar"/>
-                <include name="log4j-core-2.17.0.jar"/>
+                <include name="slf4j-api-*.jar"/>
+                <include name="log4j-slf4j-impl-*.jar"/>
+                <include name="log4j-api-*.jar"/>
+                <include name="log4j-core-*.jar"/>
             </lib>
         </war>
     </target>