You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2019/09/29 20:16:21 UTC

[jmeter] branch master updated: Updated to log4j 2.12.1 (from 2.11.1)

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

pmouawad 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 9f72a18  Updated to log4j 2.12.1 (from 2.11.1)
9f72a18 is described below

commit 9f72a182f113ec011344f012e7cfe4cd6e78751e
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Sun Sep 29 22:15:59 2019 +0200

    Updated to log4j 2.12.1 (from 2.11.1)
---
 gradle.properties | 2 +-
 lib/aareadme.txt  | 2 +-
 xdocs/changes.xml | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c8c7588..2aad35e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -81,7 +81,7 @@ jsoup.version=1.12.1
 jtidy.version=r938
 junit4.version=4.12
 junit5.version=5.5.1
-log4j.version=2.11.1
+log4j.version=2.12.1
 mail.version=1.5.0-b01
 mina-core.version=2.0.19
 mongo-java-driver.version=2.11.3
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index e9265f4..4468793 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -179,7 +179,7 @@ jsoup-1.12.1
 http://www.jsoup.org/
 - CSS/JQuery like extractor
 
-log4j2-2.11.1
+log4j2-2.12.1
 --------
 https://logging.apache.org/log4j/2.x/
 - Logging framework
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 8e49b90..7251c8b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -143,6 +143,7 @@ to view the last release notes of version 5.1.1.
     <li>Updated to freemarker 2.3.29 (from 2.3.28)</li>
     <li>Updated to httpcore/httpcore-nio 4.12 (from 4.11)</li>
     <li>Updated to jodd 5.0.13 (from 5.0.6)</li>
+    <li>Updated to log4j 2.12.1 (from 2.11.1)</li>
     <li><bug>63396</bug>JSR223 Test Elements: Description of Parameters is misleading, same for Script</li>
     <li><bug>63480</bug>XPathAssertion and XPathAssertion2: Improve test coverage for input coming from variable. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
     <li><bug>63452</bug>Tools / Import from cURL: Complete coverage of all command line options that are valid in JMeter use case. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>