From 34573a4a0f5a195aa2b3c18677b97f883f5acec3 Mon Sep 17 00:00:00 2001
From: Jack Shirazi <jack.shirazi@elastic.co>
Date: Thu, 30 Dec 2021 15:17:40 +0000
Subject: [PATCH] apply PR #2378 to 1.26 branch (log4j upgrade to 2.12.4)

---
 CHANGELOG.asciidoc                            | 22 +++++++++++++++++--
 .../apm-log-shader-plugin/pom.xml             |  2 +-
 pom.xml                                       |  4 ++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 61e50225b0..0a9598fd40 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -20,8 +20,8 @@ endif::[]
 
 === Unreleased
 
-[[release-notes-1.28.4]]
-==== 1.28.4 - YYYY/MM/DD
+[[release-notes-1.28.5]]
+==== 1.28.5 - YYYY/MM/DD
 
 [float]
 ===== Bug fixes
@@ -29,6 +29,17 @@ endif::[]
 [[release-notes-1.x]]
 === Java Agent version 1.x
 
+[[release-notes-1.28.4]]
+==== 1.28.4 - 2021/12/30
+
+[float]
+===== Bug fixes
+* Fix `@Traced` annotation to return proper outcome instead of `failed` - {pull}2370[#2370]
+
+[float]
+===== Dependency updates
+* Update Log4j to 2.12.4 and log4j2-ecs-layout to 1.3.2 - {pull}2378[#2378]
+
 [[release-notes-1.28.3]]
 ==== 1.28.3 - 2021/12/22
 
@@ -172,6 +183,13 @@ discovery - {pull}2205[#2205]
 * Replace concurrency plugin maps to `SpanConcurrentHashMap` ones - {pull}2173[#2173]
 * Align User-Agent HTTP header with other APM agents - {pull}2177[#2177]
 
+[[release-notes-1.26.2]]
+==== 1.26.2 - 2021/12/30
+
+[float]
+===== Dependency updates
+* Update Log4j to 2.12.4 and log4j2-ecs-layout to 1.3.2 - {pull}2378[#2378]
+
 [[release-notes-1.26.1]]
 ==== 1.26.1 - 2021/12/22
 
diff --git a/apm-agent-plugins/apm-log-shader-plugin/pom.xml b/apm-agent-plugins/apm-log-shader-plugin/pom.xml
index efb30009e7..d581ca0945 100644
--- a/apm-agent-plugins/apm-log-shader-plugin/pom.xml
+++ b/apm-agent-plugins/apm-log-shader-plugin/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <apm-agent-parent.base.dir>${project.basedir}/../..</apm-agent-parent.base.dir>
-        <version.ecs.logging>1.3.0</version.ecs.logging>
+        <version.ecs.logging>1.3.2</version.ecs.logging>
     </properties>
 
     <modules>
diff --git a/pom.xml b/pom.xml
index 94bc90aaa9..0a5df06ecb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,8 +106,8 @@
         <!-- 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.3</version.log4j>
-        <version.log4j2-ecs-layout>1.3.0</version.log4j2-ecs-layout>
+        <version.log4j>2.12.4</version.log4j>
+        <version.log4j2-ecs-layout>1.3.2</version.log4j2-ecs-layout>
         <version.spring>5.0.15.RELEASE</version.spring>
         <version.spring-boot>2.2.2.RELEASE</version.spring-boot>
         <version.jetty-server>9.4.11.v20180605</version.jetty-server>