You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by mi...@apache.org on 2021/12/23 16:46:21 UTC
[jmeter] branch fix-CVE-2021-45105 created (now 9ddd26b)
This is an automated email from the ASF dual-hosted git repository.
milamber pushed a change to branch fix-CVE-2021-45105
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
at 9ddd26b prepare new version 5.4.3
This branch includes the following new commits:
new a55c6ef Update log4j to 2.17.0 (fix CVE-2021-45105)
new 9ddd26b prepare new version 5.4.3
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jmeter] 02/02: prepare new version 5.4.3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
milamber pushed a commit to branch fix-CVE-2021-45105
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 9ddd26bbcab8da2213ac9d804cef6b557c86b344
Author: Milamber <mi...@apache.org>
AuthorDate: Thu Dec 23 17:46:02 2021 +0100
prepare new version 5.4.3
---
gradle.properties | 2 +-
xdocs/download_jmeter.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index f9e4c54..7f0f13c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,7 +30,7 @@ kotlin.parallel.tasks.in.project=true
# This is version for Apache JMeter itself
# Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
# Release version can be generated by using -Prelease or -Prc=<int> arguments
-jmeter.version=5.4.2
+jmeter.version=5.4.3
# Tools
checkstyle.version=8.35
diff --git a/xdocs/download_jmeter.xml b/xdocs/download_jmeter.xml
index 72b1d9c..9f5d187 100644
--- a/xdocs/download_jmeter.xml
+++ b/xdocs/download_jmeter.xml
@@ -18,7 +18,7 @@
<!DOCTYPE document
[
-<!ENTITY release '5.4.2'>
+<!ENTITY release '5.4.3'>
<!ENTITY hellip "…" >
]>
[jmeter] 01/02: Update log4j to 2.17.0 (fix CVE-2021-45105)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
milamber pushed a commit to branch fix-CVE-2021-45105
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit a55c6efb79e1605a5cded67b6f0366676e0fc264
Author: Milamber <mi...@apache.org>
AuthorDate: Thu Dec 23 17:42:16 2021 +0100
Update log4j to 2.17.0 (fix CVE-2021-45105)
---
checksum.xml | 2 +-
gradle.properties | 2 +-
src/dist/src/dist/expected_release_jars.csv | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index 1d19efc..556ea1c 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -105,7 +105,7 @@
<trusted-key id='cbaebe39a46c4ca1' group='org.apache.geronimo.specs' />
<trusted-key id='ecdfea3cb4493b94' group='org.apache.geronimo.specs' />
<trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
- <trusted-key id='b4c70893b62babe8' group='org.apache.logging.log4j' />
+ <trusted-key id='3595395eb3d8e1ba' group='org.apache.logging.log4j' />
<trusted-key id='c7bf26d0bb617866' group='org.apache.maven' />
<trusted-key id='31474e5e7c6b7034' group='org.apache.mina' />
<trusted-key id='9c8c892f91f8e6d1' group='org.apache.rat' />
diff --git a/gradle.properties b/gradle.properties
index 64ee8d4..f9e4c54 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -106,7 +106,7 @@ jsoup.version=1.13.1
jtidy.version=r938
junit4.version=4.13.1
junit5.version=5.7.0
-log4j.version=2.16.0
+log4j.version=2.17.0
mail.version=1.5.0-b01
miglayout.version=5.2
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 eab7c50..4d36b4d 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -68,10 +68,10 @@
249924,jtidy-r938.jar
382708,junit-4.13.1.jar
48483,jxlayer-3.0.4.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
106939,miglayout-core-5.2.jar
22390,miglayout-swing-5.2.jar