From 86b345e487462fed2d333f85fc6f8ab930cdf6d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 18:10:33 +0000
Subject: [PATCH 1/2] build: bump version.log4j from 2.12.4 to 2.24.2

Bumps `version.log4j` from 2.12.4 to 2.24.2.

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

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

---
updated-dependencies:
- 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-slf4j-impl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

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 1e34380b95..42f7f32934 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.24.1</version>
+            <version>2.24.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 94528737bf..39a145b506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,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.24.2</version.log4j>
         <version.ecs.logging>1.6.0</version.ecs.logging>
         <version.spring>5.0.15.RELEASE</version.spring>
         <version.jetty-server>9.4.11.v20180605</version.jetty-server>

From 8293140f84339af4005952448860d7267c4924dd Mon Sep 17 00:00:00 2001
From: jackshirazi <jack.shirazi@elastic.co>
Date: Mon, 25 Nov 2024 18:23:39 +0000
Subject: [PATCH 2/2] revert

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

diff --git a/pom.xml b/pom.xml
index 39a145b506..94528737bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,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.24.2</version.log4j>
+        <version.log4j>2.12.4</version.log4j>
         <version.ecs.logging>1.6.0</version.ecs.logging>
         <version.spring>5.0.15.RELEASE</version.spring>
         <version.jetty-server>9.4.11.v20180605</version.jetty-server>