From 7ab2cca1a9edc14b6fecc3d1cdb1df7e55974216 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Oct 2023 13:43:20 +0000
Subject: [PATCH 1/3] Bump version.log4j from 2.12.4 to 2.21.0

Bumps `version.log4j` from 2.12.4 to 2.21.0.

Updates `org.apache.logging.log4j:log4j-core` from 2.12.4 to 2.21.0

Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.12.4 to 2.21.0

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.apache.logging.log4j:log4j-slf4j-impl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 apm-agent-plugins/apm-ecs-logging-plugin/pom.xml               | 2 +-
 apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml | 2 +-
 pom.xml                                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apm-agent-plugins/apm-ecs-logging-plugin/pom.xml b/apm-agent-plugins/apm-ecs-logging-plugin/pom.xml
index e61eda6307..e0a68cbc7a 100644
--- a/apm-agent-plugins/apm-ecs-logging-plugin/pom.xml
+++ b/apm-agent-plugins/apm-ecs-logging-plugin/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.20.0</version>
+            <version>2.21.0</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
diff --git a/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml b/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml
index 2947ec3339..9222c92045 100644
--- a/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml
+++ b/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.1</version>
+            <version>2.21.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index a658c40a84..99c9447d84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
         <!-- this is the last version of log4j that is compatible with Java 7. Due to a known vulnerability
         (https://nvd.nist.gov/vuln/detail/CVE-2020-9488#vulnCurrentDescriptionTitle), the SMTP appender is
          excluded from the build and not packaged into the agent artifacts -->
-        <version.log4j>2.12.4</version.log4j>
+        <version.log4j>2.21.0</version.log4j>
         <version.ecs.logging>1.5.0</version.ecs.logging>
         <version.spring>5.0.15.RELEASE</version.spring>
         <version.jetty-server>9.4.11.v20180605</version.jetty-server>

From 2b45dc40d03f14f7ae623f5eab28227cff82f442 Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Wed, 18 Oct 2023 09:46:00 +0200
Subject: [PATCH 2/3] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 99c9447d84..a658c40a84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
         <!-- this is the last version of log4j that is compatible with Java 7. Due to a known vulnerability
         (https://nvd.nist.gov/vuln/detail/CVE-2020-9488#vulnCurrentDescriptionTitle), the SMTP appender is
          excluded from the build and not packaged into the agent artifacts -->
-        <version.log4j>2.21.0</version.log4j>
+        <version.log4j>2.12.4</version.log4j>
         <version.ecs.logging>1.5.0</version.ecs.logging>
         <version.spring>5.0.15.RELEASE</version.spring>
         <version.jetty-server>9.4.11.v20180605</version.jetty-server>

From da43a475efd5c0d16d14df57d6a182d8aca7cd24 Mon Sep 17 00:00:00 2001
From: Jonas Kunz <jonas.kunz@elastic.co>
Date: Wed, 18 Oct 2023 09:46:17 +0200
Subject: [PATCH 3/3] Update pom.xml

---
 apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml b/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml
index 9222c92045..2947ec3339 100644
--- a/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml
+++ b/apm-agent-plugins/apm-logging-plugin/apm-log4j2-plugin/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.21.0</version>
+            <version>2.17.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>