Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #7297 - Removing log4j 1.x (#7353) 

* Issue #7297 - Removing log4j 1.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #7297 - Deprecating log4j 1.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2022-01-05 12:26:05 -06:00 committed by GitHub
parent 45fc93aec1
commit 13956b27e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-home/pom.xml
View File

@ -876,11 +876,6 @@
<type>jar</type> <type>jar</type>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>log4j-api</artifactId>

7
jetty-home/src/main/resources/modules/logging-log4j1.mod
View File

@ -4,8 +4,13 @@
Configures Jetty logging to use Log4j. Configures Jetty logging to use Log4j.
SLF4J is used as the core logging mechanism. SLF4J is used as the core logging mechanism.
[deprecated]
Module 'logging-log4j1' is deprecated for removal.
Use 'logging-log4j2' instead.
[tags] [tags]
logging logging
deprecated
[depends] [depends]
logging/slf4j logging/slf4j
@ -25,7 +30,7 @@ lib/logging/slf4j-log4j12-${slf4j.version}.jar
lib/logging/log4j-${log4j.version}.jar lib/logging/log4j-${log4j.version}.jar
[ini] [ini]
log4j.version?=@log4j.version@ log4j.version?=1.2.17
jetty.webapp.addServerClasses+=,org.apache.log4j. jetty.webapp.addServerClasses+=,org.apache.log4j.

14
jetty-home/src/main/resources/modules/logging-log4j2.mod
View File

@ -17,17 +17,17 @@ log4j
[files] [files]
basehome:modules/logging/log4j2 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-slf4j18-impl/${log4j2.version}|lib/logging/log4j-slf4j18-impl-${log4j2.version}.jar
maven://org.apache.logging.log4j/log4j-api/${log4j.version}|lib/logging/log4j-api-${log4j.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/${log4j.version}|lib/logging/log4j-core-${log4j.version}.jar maven://org.apache.logging.log4j/log4j-core/${log4j2.version}|lib/logging/log4j-core-${log4j2.version}.jar
[lib] [lib]
lib/logging/log4j-slf4j18-impl-${log4j.version}.jar lib/logging/log4j-slf4j18-impl-${log4j2.version}.jar
lib/logging/log4j-api-${log4j.version}.jar lib/logging/log4j-api-${log4j2.version}.jar
lib/logging/log4j-core-${log4j.version}.jar lib/logging/log4j-core-${log4j2.version}.jar
[ini] [ini]
log4j.version?=@log4j2.version@ log4j2.version?=@log4j2.version@
jetty.webapp.addServerClasses+=,org.apache.logging.log4j. jetty.webapp.addServerClasses+=,org.apache.logging.log4j.
[license] [license]

2
jetty-unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod
View File

@ -13,10 +13,10 @@ Use 'unixdomain-http' instead (requires Java 16 or later).
[tags] [tags]
connector connector
deprecated
[depend] [depend]
unixsocket-http unixsocket-http
deprecated
[xml] [xml]
etc/jetty-unixsocket-secure.xml etc/jetty-unixsocket-secure.xml

6
pom.xml
View File

@ -95,7 +95,6 @@
<jsp.impl.version>9.0.52</jsp.impl.version> <jsp.impl.version>9.0.52</jsp.impl.version>
<junit.version>5.8.2</junit.version> <junit.version>5.8.2</junit.version>
<kerb-simplekdc.version>2.0.1</kerb-simplekdc.version> <kerb-simplekdc.version>2.0.1</kerb-simplekdc.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.17.1</log4j2.version> <log4j2.version>2.17.1</log4j2.version>
<logback.version>1.3.0-alpha12</logback.version> <logback.version>1.3.0-alpha12</logback.version>
<mariadb.version>2.7.4</mariadb.version> <mariadb.version>2.7.4</mariadb.version>
@ -1119,11 +1118,6 @@
<artifactId>jakarta.xml.ws-api</artifactId> <artifactId>jakarta.xml.ws-api</artifactId>
<version>${jakarta.xml.ws.api.version}</version> <version>${jakarta.xml.ws.api.version}</version>
</dependency> </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency> <dependency>
<groupId>net.java.dev.jna</groupId> <groupId>net.java.dev.jna</groupId>
<artifactId>jna-jpms</artifactId> <artifactId>jna-jpms</artifactId>