This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 8051b7fa7 AMQ-9357: Upgrade to log4j 2.21.1
new a6631734f Merge pull request #1089 from jbonofre/AMQ-9357
8051b7fa7 is described below
commit 8051b7fa74cb9d608e6a8b6b3dd9e4d6cbf4d9c9
Author: Jean-Baptiste Onofré <[email protected]>
AuthorDate: Sat Oct 21 15:03:30 2023 +0200
AMQ-9357: Upgrade to log4j 2.21.1
---
activemq-web-console/pom.xml | 2 ++
pom.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 489a64531..01c460dac 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -266,10 +266,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- JSTL support -->
diff --git a/pom.xml b/pom.xml
index fc868cd49..f5260c412 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<junit-version>4.13.2</junit-version>
<hamcrest-version>1.3</hamcrest-version>
<karaf-version>4.3.7</karaf-version>
- <log4j-version>2.20.0</log4j-version>
+ <log4j-version>2.21.1</log4j-version>
<mockito-version>4.8.1</mockito-version>
<owasp-dependency-check-version>8.4.0</owasp-dependency-check-version>
<mqtt-client-version>1.16</mqtt-client-version>
