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

Bump log4j2 to 2.19.0 (#8605) 

* Bump log4j2 to 2.19.0
+ Remove old exclusions to log4j in infinispan
  (no longer relevant)
* fix usage of log4j-slf4j2-impl

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-09-22 02:38:48 -05:00 committed by GitHub
parent 090104d643
commit ebfb7c63bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
javadoc/pom.xml
View File

@ -426,13 +426,6 @@
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId> <artifactId>infinispan-client-hotrod</artifactId>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- to make infinispan-common source sane --> <!-- to make infinispan-common source sane -->
<dependency> <dependency>

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

7
jetty-infinispan/infinispan-common/pom.xml
View File

@ -46,13 +46,6 @@
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId> <artifactId>infinispan-client-hotrod</artifactId>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>

7
jetty-infinispan/infinispan-remote-query/pom.xml
View File

@ -102,13 +102,6 @@
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId> <artifactId>infinispan-client-hotrod</artifactId>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>

7
jetty-infinispan/infinispan-remote/pom.xml
View File

@ -81,13 +81,6 @@
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId> <artifactId>infinispan-client-hotrod</artifactId>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>

2
pom.xml
View File

@ -102,7 +102,7 @@
<jsp.impl.version>9.0.52</jsp.impl.version> <jsp.impl.version>9.0.52</jsp.impl.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.1</logback.version> <logback.version>1.4.1</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>

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

@ -83,7 +83,7 @@ public class LoggingOptionsTests extends AbstractJettyHomeTest
Arguments.of("logging-log4j2", Arguments.of("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"
), ),

7
tests/test-sessions/test-infinispan-sessions/pom.xml
View File

@ -121,13 +121,6 @@
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId> <artifactId>infinispan-client-hotrod</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>