From 5889ebae54f1d40d8689253457cc61262f4e3b84 Mon Sep 17 00:00:00 2001
From: smiep <Piotr.Smietana@pega.com>
Date: Wed, 29 Dec 2021 14:22:00 +0000
Subject: [PATCH] Update log4j2 to 2.17.1

---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 xdocs/changes.xml                           | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 154d602a448..df7baa176cc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -115,7 +115,7 @@ junit4.version=4.13.2
 junit5.version=5.8.1
 lets-plot-batik.version=2.2.1
 lets-plot-kotlin-jvm.version=3.1.1
-log4j.version=2.17.0
+log4j.version=2.17.1
 mail.version=1.5.0-b01
 miglayout.version=5.3
 mina-core.version=2.0.19
diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv
index 27a5d84f98a..3cd09108c19 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -94,10 +94,10 @@
 792176,kotlinx-html-jvm-0.7.3.jar
 181223,lets-plot-batik-2.2.1.jar
 4025480,lets-plot-common-2.2.1.jar
-208235,log4j-1.2-api-2.17.0.jar
-301776,log4j-api-2.17.0.jar
-1789339,log4j-core-2.17.0.jar
-24252,log4j-slf4j-impl-2.17.0.jar
+208006,log4j-1.2-api-2.17.1.jar
+301872,log4j-api-2.17.1.jar
+1790452,log4j-core-2.17.1.jar
+24279,log4j-slf4j-impl-2.17.1.jar
 519087,mail-1.5.0-b01.jar
 106949,miglayout-core-5.3.jar
 22576,miglayout-swing-5.3.jar
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e48dfb09190..33606f2ab5a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -61,7 +61,7 @@ Summary
 <ch_section>New and Noteworthy</ch_section>
 <p>JMeter now supports Java 17</p>
 
-<p>JMeter 5.5 ships with log4j2 2.17</p>
+<p>JMeter 5.5 ships with log4j2 2.17.1</p>
 
 <p>New component: <code><a href="./usermanual/component_reference.html#Open_Model_Thread_Group">Open Model Thread Group</a></code>
 allows creating load profiles with variable load.</p>
@@ -175,7 +175,7 @@ however, the profile can't be updated while the test is running.
   <li>Updated json-path to 2.6.0 (from 2.4.0).</li>
   <li>Updated jsoup to 1.14.1 (from 1.13.1).</li>
   <li>Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0).</li>
-  <li>Updated Apache log4j2 to 2.17.0 (from 2.13.3).</li>
+  <li>Updated Apache log4j2 to 2.17.1 (from 2.13.3).</li>
   <li>Updated Miglayout to 5.3 (from 5.2).</li>
   <li>Updated Neo4j Java driver to 4.3.3 (from 4.2.0).</li>
   <li>Updated Objenesis to 3.2 (from 2.6).</li>
@@ -290,6 +290,7 @@ however, the profile can't be updated while the test is running.
   <li>Woonsan Ko (woonsan.ko at bloomreach.com)</li>
   <li>Chromico Rek (atech5122 at gmail.com)</li>
   <li>Magnus Spångdal (magnus.spangdal as avanza.se)</li>
+  <li>Piotr Smietana (piotrsmietana1998 at gmail.com)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <ul>