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

Updated SLF4J to 2.0.1. 

Updated Log4j2 to 2.19.0.
Updated logging-log4j2.mod.
Removed references to og4j-slf4j18-impl, replaced by log4j-slf4j2-impl.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2022-09-20 22:04:36 +02:00
parent 95bf791b71
commit 3dd81be051
No known key found for this signature in database
GPG Key ID: 1677D141BCF3584D
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/jetty-documentation/src/main/asciidoc/operations-guide/logging/logging-server.adoc
View File

@ -165,7 +165,7 @@ $JETTY_BASE
│ └── logging │ └── logging
│ ├── log4j-api-<version>.jar │ ├── log4j-api-<version>.jar
│ ├── log4j-core-<version>.jar │ ├── log4j-core-<version>.jar
│ └── log4j-slf4j18-impl-<version>.jar │ └── log4j-slf4j2-impl-<version>.jar
├── resources ├── resources
│ └── log4j2.xml │ └── log4j2.xml
└── start.d └── start.d

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

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

4
pom.xml
View File

@ -72,7 +72,7 @@
<json-smart.version>2.4.8</json-smart.version> <json-smart.version>2.4.8</json-smart.version>
<junit.version>5.9.0</junit.version> <junit.version>5.9.0</junit.version>
<kerb-simplekdc.version>2.0.2</kerb-simplekdc.version> <kerb-simplekdc.version>2.0.2</kerb-simplekdc.version>
<log4j2.version>2.18.0</log4j2.version> <log4j2.version>2.19.0</log4j2.version>
<logback.version>1.4.0</logback.version> <logback.version>1.4.0</logback.version>
<mariadb.version>3.0.7</mariadb.version> <mariadb.version>3.0.7</mariadb.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version> <mariadb.docker.version>10.3.6</mariadb.docker.version>
@ -88,7 +88,7 @@
<org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version> <org.osgi.util.promise.version>1.2.0</org.osgi.util.promise.version>
<plexus-component-annotations.version>2.1.1</plexus-component-annotations.version> <plexus-component-annotations.version>2.1.1</plexus-component-annotations.version>
<plexus-utils.version>3.4.2</plexus-utils.version> <plexus-utils.version>3.4.2</plexus-utils.version>
<slf4j.version>2.0.0</slf4j.version> <slf4j.version>2.0.1</slf4j.version>
<springboot.version>2.1.1.RELEASE</springboot.version> <springboot.version>2.1.1.RELEASE</springboot.version>
<testcontainers.version>1.17.3</testcontainers.version> <testcontainers.version>1.17.3</testcontainers.version>
<weld.version>4.0.3.Final</weld.version> <weld.version>4.0.3.Final</weld.version>

2
tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/LoggingOptionsTests.java
View File

@ -88,7 +88,7 @@ public class LoggingOptionsTests extends AbstractJettyHomeTest
arguments.add(Arguments.of(env, "logging-log4j2", arguments.add(Arguments.of(env, "logging-log4j2",
Arrays.asList( Arrays.asList(
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar", "\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-slf4j18-impl-.*\\.jar", "\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-slf4j2-impl-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-api-.*\\.jar", "\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-core-.*\\.jar" "\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]log4j-core-.*\\.jar"
), ),