[jmeter] branch master updated: Update log4j to 2.17.0

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 5f1d3d2  Update log4j to 2.17.0
5f1d3d2 is described below

commit 5f1d3d27dfda35fd5c604156ad1d2c02e0063691
Author: Chromico Rek <at...@gmail.com>
AuthorDate: Sun Dec 19 20:08:48 2021 +0400

    Update log4j to 2.17.0
    
    Relates to CVE-2021-45105
    Closes #683
---
 gradle.properties                           | 2 +-
 src/dist/src/dist/expected_release_jars.csv | 8 ++++----
 xdocs/changes.xml                           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f5c262f..bb5ff14 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.0
 lets-plot-kotlin-jvm.version=3.1.0
-log4j.version=2.16.0
+log4j.version=2.17.0
 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 ee47255..52aaea2 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
 191102,lets-plot-batik-2.2.0.jar
 3995999,lets-plot-common-2.2.0.jar
-207909,log4j-1.2-api-2.16.0.jar
-301892,log4j-api-2.16.0.jar
-1789565,log4j-core-2.16.0.jar
-24258,log4j-slf4j-impl-2.16.0.jar
+207909,log4j-1.2-api-2.17.0.jar
+301892,log4j-api-2.17.0.jar
+1789565,log4j-core-2.17.0.jar
+24258,log4j-slf4j-impl-2.17.0.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 967f6b8..af8db71 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -168,7 +168,7 @@ Summary
   <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.16.0 (from 2.13.3).</li>
+  <li>Updated Apache log4j2 to 2.17.0 (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>