From 308ff1244507d6e37110beeb5e18497b0534a2b2 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 5 Jan 2022 10:06:00 -0600 Subject: [PATCH] Issue #7297 - Deprecating log4j 1.x Signed-off-by: Joakim Erdfelt --- jetty-home/src/main/resources/modules/logging-log4j1.mod | 5 +++++ .../src/main/config-template/modules/unixsocket-secure.mod | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jetty-home/src/main/resources/modules/logging-log4j1.mod b/jetty-home/src/main/resources/modules/logging-log4j1.mod index fec58dc54e39..11acb6dfee7b 100644 --- a/jetty-home/src/main/resources/modules/logging-log4j1.mod +++ b/jetty-home/src/main/resources/modules/logging-log4j1.mod @@ -4,8 +4,13 @@ Configures Jetty logging to use Log4j. SLF4J is used as the core logging mechanism. +[deprecated] +Module 'logging-log4j1' is deprecated for removal. +Use 'logging-log4j2' instead. + [tags] logging +deprecated [depends] logging/slf4j diff --git a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod index e78ee66dc9f4..8dfe843774d9 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod +++ b/jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod @@ -13,10 +13,10 @@ Use 'unixdomain-http' instead (requires Java 16 or later). [tags] connector +deprecated [depend] unixsocket-http -deprecated [xml] etc/jetty-unixsocket-secure.xml