Skip to content

Issue #7297 - Removing log4j 1.x #7353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 5, 2022
Merged

Issue #7297 - Removing log4j 1.x #7353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de72bd5
Issue #7297 - Removing log4j 1.x
joakime Jan 4, 2022
308ff12
Issue #7297 - Deprecating log4j 1.x
joakime Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions jetty-home/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,11 +876,6 @@
<type>jar</type>
<optional>true</optional>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
Expand Down
7 changes: 6 additions & 1 deletion jetty-home/src/main/resources/modules/logging-log4j1.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.


Expand Down
14 changes: 7 additions & 7 deletions jetty-home/src/main/resources/modules/logging-log4j2.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[email protected]@
log4j2[email protected]@
jetty.webapp.addServerClasses+=,org.apache.logging.log4j.

[license]
Expand Down
2 changes: 1 addition & 1 deletion ...unixsocket/jetty-unixsocket-server/src/main/config-template/modules/unixsocket-secure.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
<jsp.impl.version>9.0.52</jsp.impl.version>
<junit.version>5.8.2</junit.version>
<kerb-simplekdc.version>2.0.1</kerb-simplekdc.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.17.1</log4j2.version>
<logback.version>1.3.0-alpha12</logback.version>
<mariadb.version>2.7.4</mariadb.version>
Expand Down Expand Up @@ -1119,11 +1118,6 @@
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${jakarta.xml.ws.api.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-jpms</artifactId>
Expand Down