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

Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0 (#8467) 

* Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0
* use new artifactId slf4j-reload4j

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
This commit is contained in:
Joakim Erdfelt 2022-08-16 06:58:48 -05:00 committed by GitHub
parent 6f0623f48d
commit 3157256ff9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,10 +23,10 @@ log4j
[files] [files]
basehome:modules/logging/log4j1 basehome:modules/logging/log4j1
maven://log4j/log4j/${log4j.version}|lib/logging/log4j-${log4j.version}.jar maven://log4j/log4j/${log4j.version}|lib/logging/log4j-${log4j.version}.jar
maven://org.slf4j/slf4j-log4j12/${slf4j.version}|lib/logging/slf4j-log4j12-${slf4j.version}.jar maven://org.slf4j/slf4j-reload4j/${slf4j.version}|lib/logging/slf4j-reload4j-${slf4j.version}.jar
[lib] [lib]
lib/logging/slf4j-log4j12-${slf4j.version}.jar lib/logging/slf4j-reload4j-${slf4j.version}.jar
lib/logging/log4j-${log4j.version}.jar lib/logging/log4j-${log4j.version}.jar
[ini] [ini]

4
pom.xml
View File

@ -103,7 +103,7 @@
<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.18.0</log4j2.version>
<logback.version>1.3.0-alpha16</logback.version> <logback.version>1.3.0-beta0</logback.version>
<mariadb.version>3.0.6</mariadb.version> <mariadb.version>3.0.6</mariadb.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version> <mariadb.docker.version>10.3.6</mariadb.docker.version>
<maven.resolver.version>1.8.2</maven.resolver.version> <maven.resolver.version>1.8.2</maven.resolver.version>
@ -116,7 +116,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-alpha6</slf4j.version> <slf4j.version>2.0.0-beta1</slf4j.version>
<springboot.version>2.1.1.RELEASE</springboot.version> <springboot.version>2.1.1.RELEASE</springboot.version>
<taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version> <taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version>
<taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version> <taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version>

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

@ -73,7 +73,7 @@ public class LoggingOptionsTests extends AbstractJettyHomeTest
Arguments.of("logging-log4j1", Arguments.of("logging-log4j1",
Arrays.asList( Arrays.asList(
"\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar", "\\$\\{jetty.home\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-api-.*\\.jar",
"\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-log4j12-.*\\.jar" "\\$\\{jetty.base\\}[/\\\\]lib[/\\\\]logging[/\\\\]slf4j-reload4j-.*\\.jar"
), ),
Arrays.asList( Arrays.asList(
"logging/slf4j", "logging/slf4j",