From 58999d1461aea23f972818493b90b919498c4c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Tue, 2 Jan 2024 17:04:02 +0100
Subject: [PATCH] GH-536: Upgrade to log4j2 2.22.1

---
 pax-logging-api/osgi.bnd | 12 ++++++++++++
 pom.xml                  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pax-logging-api/osgi.bnd b/pax-logging-api/osgi.bnd
index b6c0bbc84..ed0fd0e8b 100644
--- a/pax-logging-api/osgi.bnd
+++ b/pax-logging-api/osgi.bnd
@@ -81,36 +81,48 @@ Export-Package: \
  org.apache.logging.log4j;-split-package:=merge-first; version=2.14.1; provider=paxlogging, \
  org.apache.logging.log4j;-split-package:=merge-first; version=2.15.0; provider=paxlogging, \
  org.apache.logging.log4j;-split-package:=merge-first; version=2.16.0; provider=paxlogging, \
+ org.apache.logging.log4j;-split-package:=merge-first; version=2.20.0; provider=paxlogging, \
+ org.apache.logging.log4j;-split-package:=merge-first; version=2.21.0; provider=paxlogging, \
  org.apache.logging.log4j.message; version=${version.org.apache.logging.log4j}; provider=paxlogging, \
  org.apache.logging.log4j.message; version=2.9.1; provider=paxlogging, \
  org.apache.logging.log4j.message; version=2.13.3; provider=paxlogging, \
  org.apache.logging.log4j.message; version=2.14.1; provider=paxlogging, \
  org.apache.logging.log4j.message; version=2.15.0; provider=paxlogging, \
  org.apache.logging.log4j.message; version=2.16.0; provider=paxlogging, \
+ org.apache.logging.log4j.message; version=2.20.0; provider=paxlogging, \
+ org.apache.logging.log4j.message; version=2.21.0; provider=paxlogging, \
  org.apache.logging.log4j.simple; version=${version.org.apache.logging.log4j}; provider=paxlogging, \
  org.apache.logging.log4j.simple; version=2.9.1; provider=paxlogging, \
  org.apache.logging.log4j.simple; version=2.13.3; provider=paxlogging, \
  org.apache.logging.log4j.simple; version=2.14.1; provider=paxlogging, \
  org.apache.logging.log4j.simple; version=2.15.0; provider=paxlogging, \
  org.apache.logging.log4j.simple; version=2.16.0; provider=paxlogging, \
+ org.apache.logging.log4j.simple; version=2.20.0; provider=paxlogging, \
+ org.apache.logging.log4j.simple; version=2.21.0; provider=paxlogging, \
  org.apache.logging.log4j.spi; version=${version.org.apache.logging.log4j}; provider=paxlogging, \
  org.apache.logging.log4j.spi; version=2.9.1; provider=paxlogging, \
  org.apache.logging.log4j.spi; version=2.13.3; provider=paxlogging, \
  org.apache.logging.log4j.spi; version=2.14.1; provider=paxlogging, \
  org.apache.logging.log4j.spi; version=2.15.0; provider=paxlogging, \
  org.apache.logging.log4j.spi; version=2.16.0; provider=paxlogging, \
+ org.apache.logging.log4j.spi; version=2.20.0; provider=paxlogging, \
+ org.apache.logging.log4j.spi; version=2.21.0; provider=paxlogging, \
  org.apache.logging.log4j.status;-split-package:=merge-first; version=${version.org.apache.logging.log4j}; provider=paxlogging, \
  org.apache.logging.log4j.status;-split-package:=merge-first; version=2.9.1; provider=paxlogging, \
  org.apache.logging.log4j.status;-split-package:=merge-first; version=2.13.3; provider=paxlogging, \
  org.apache.logging.log4j.status;-split-package:=merge-first; version=2.14.1; provider=paxlogging, \
  org.apache.logging.log4j.status;-split-package:=merge-first; version=2.15.0; provider=paxlogging, \
  org.apache.logging.log4j.status;-split-package:=merge-first; version=2.16.0; provider=paxlogging, \
+ org.apache.logging.log4j.status;-split-package:=merge-first; version=2.20.0; provider=paxlogging, \
+ org.apache.logging.log4j.status;-split-package:=merge-first; version=2.21.0; provider=paxlogging, \
  org.apache.logging.log4j.util;-split-package:=merge-first; version=${version.org.apache.logging.log4j}; provider=paxlogging, \
  org.apache.logging.log4j.util;-split-package:=merge-first; version=2.9.1; provider=paxlogging, \
  org.apache.logging.log4j.util;-split-package:=merge-first; version=2.13.3; provider=paxlogging, \
  org.apache.logging.log4j.util;-split-package:=merge-first; version=2.14.1; provider=paxlogging, \
  org.apache.logging.log4j.util;-split-package:=merge-first; version=2.15.0; provider=paxlogging, \
  org.apache.logging.log4j.util;-split-package:=merge-first; version=2.16.0; provider=paxlogging, \
+ org.apache.logging.log4j.util;-split-package:=merge-first; version=2.20.0; provider=paxlogging, \
+ org.apache.logging.log4j.util;-split-package:=merge-first; version=2.21.0; provider=paxlogging, \
  org.ops4j.pax.logging; version=${pom.version}; provider=paxlogging, \
  org.ops4j.pax.logging.spi; version=${pom.version}; provider=paxlogging, \
  org.osgi.service.log; version=1.4;-split-package:=merge-first, \
diff --git a/pom.xml b/pom.xml
index cc27eb45a..5c9701ded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,7 +232,7 @@
         <version.org.apache.felix.configadmin>1.9.26</version.org.apache.felix.configadmin>
         <version.org.apache.felix6.framework>6.0.5</version.org.apache.felix6.framework>
         <version.org.apache.felix7.framework>7.0.5</version.org.apache.felix7.framework>
-        <version.org.apache.logging.log4j>2.21.0</version.org.apache.logging.log4j>
+        <version.org.apache.logging.log4j>2.22.1</version.org.apache.logging.log4j>
         <version.org.apache.servicemix.bundles.javax-inject>1_3</version.org.apache.servicemix.bundles.javax-inject>
         <version.org.apache.sling.commons.johnzon>1.2.14</version.org.apache.sling.commons.johnzon>
         <!-- 3.5.0.Final is JDK11 only, but we'll export 3.5.3 package version anyway -->