diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 34ada1fcf22a..956d213628ed 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 b19a511afbc3..fec58dc54e39 100644 --- a/jetty-home/src/main/resources/modules/logging-log4j1.mod +++ b/jetty-home/src/main/resources/modules/logging-log4j1.mod @@ -25,7 +25,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 b75067bda21e..6467342313a4 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/pom.xml b/pom.xml index 6c590df967a9..74e27ddee078 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