diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index 4879dee19b1..32833fe6bc7 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -876,11 +876,6 @@
jar
true
-
- log4j
- log4j
- true
-
org.apache.logging.log4j
log4j-api
diff --git a/jetty-home/src/main/resources/modules/logging-log4j1.mod b/jetty-home/src/main/resources/modules/logging-log4j1.mod
index b19a511afbc..11acb6dfee7 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
@@ -25,7 +30,7 @@ lib/logging/slf4j-log4j12-${slf4j.version}.jar
lib/logging/log4j-${log4j.version}.jar
[ini]
-log4j.version?=@log4j.version@
+log4j.version?=1.2.17
jetty.webapp.addServerClasses+=,org.apache.log4j.
diff --git a/jetty-home/src/main/resources/modules/logging-log4j2.mod b/jetty-home/src/main/resources/modules/logging-log4j2.mod
index b75067bda21..6467342313a 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j2.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j2.mod
@@ -17,17 +17,17 @@ log4j
[files]
basehome:modules/logging/log4j2
-maven://org.apache.logging.log4j/log4j-slf4j18-impl/${log4j.version}|lib/logging/log4j-slf4j18-impl-${log4j.version}.jar
-maven://org.apache.logging.log4j/log4j-api/${log4j.version}|lib/logging/log4j-api-${log4j.version}.jar
-maven://org.apache.logging.log4j/log4j-core/${log4j.version}|lib/logging/log4j-core-${log4j.version}.jar
+maven://org.apache.logging.log4j/log4j-slf4j18-impl/${log4j2.version}|lib/logging/log4j-slf4j18-impl-${log4j2.version}.jar
+maven://org.apache.logging.log4j/log4j-api/${log4j2.version}|lib/logging/log4j-api-${log4j2.version}.jar
+maven://org.apache.logging.log4j/log4j-core/${log4j2.version}|lib/logging/log4j-core-${log4j2.version}.jar
[lib]
-lib/logging/log4j-slf4j18-impl-${log4j.version}.jar
-lib/logging/log4j-api-${log4j.version}.jar
-lib/logging/log4j-core-${log4j.version}.jar
+lib/logging/log4j-slf4j18-impl-${log4j2.version}.jar
+lib/logging/log4j-api-${log4j2.version}.jar
+lib/logging/log4j-core-${log4j2.version}.jar
[ini]
-log4j.version?=@log4j2.version@
+log4j2.version?=@log4j2.version@
jetty.webapp.addServerClasses+=,org.apache.logging.log4j.
[license]
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 e78ee66dc9f..8dfe843774d 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
diff --git a/pom.xml b/pom.xml
index 6c590df967a..74e27ddee07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,6 @@
9.0.52
5.8.2
2.0.1
- 1.2.17
2.17.1
1.3.0-alpha12
2.7.4
@@ -1119,11 +1118,6 @@
jakarta.xml.ws-api
${jakarta.xml.ws.api.version}
-
- log4j
- log4j
- ${log4j.version}
-
net.java.dev.jna
jna-jpms