From ee0e1d47fe8e822cb4609e7b327f6aba55a1560c Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 3 Jan 2024 08:06:54 -0600
Subject: [PATCH] Prevent rogue slf4j-impl coming from
 wildfly-elytron-2.2.2.Final.jar

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../java/org/eclipse/jetty/logging/StacklessLogging.java | 9 +++++++++
 pom.xml                                                  | 2 +-
 tests/test-integration/pom.xml                           | 9 +++++++++
 .../java/org/eclipse/jetty/test/DeploymentErrorTest.java | 3 ++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/StacklessLogging.java b/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/StacklessLogging.java
index 0cab4436055..8635130b4b7 100644
--- a/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/StacklessLogging.java
+++ b/jetty-slf4j-impl/src/main/java/org/eclipse/jetty/logging/StacklessLogging.java
@@ -61,6 +61,9 @@ public class StacklessLogging implements AutoCloseable
 
     public StacklessLogging(Class<?>... classesToSquelch)
     {
+        if (loggerFactory == null)
+            return;
+
         for (Class<?> clazz : classesToSquelch)
         {
             JettyLogger jettyLogger = loggerFactory.getJettyLogger(clazz.getName());
@@ -77,6 +80,9 @@ public class StacklessLogging implements AutoCloseable
 
     public StacklessLogging(Package... packagesToSquelch)
     {
+        if (loggerFactory == null)
+            return;
+
         for (Package pkg : packagesToSquelch)
         {
             JettyLogger jettyLogger = loggerFactory.getJettyLogger(pkg.getName());
@@ -93,6 +99,9 @@ public class StacklessLogging implements AutoCloseable
 
     public StacklessLogging(Logger... logs)
     {
+        if (loggerFactory == null)
+            return;
+
         for (Logger log : logs)
         {
             if (log instanceof JettyLogger && !log.isDebugEnabled())
diff --git a/pom.xml b/pom.xml
index 36485c3e64f..c4fd75f7119 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,7 +340,7 @@
     <plexus-xml.version>4.0.3</plexus-xml.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <settingsPath>src/it/settings.xml</settingsPath>
-    <slf4j.version>2.0.5</slf4j.version>
+    <slf4j.version>2.0.9</slf4j.version>
     <spotbugs.maven.plugin.version>4.8.2.0</spotbugs.maven.plugin.version>
     <springboot.version>2.1.1.RELEASE</springboot.version>
     <surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index ac770efbd20..d64effa4095 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -33,6 +33,15 @@
       <artifactId>jetty-home</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
+      <exclusions>
+        <!-- Introduces test scope dependencies that shouldn't be present during testing.
+             Such as: older slf4j-api classes,
+                      or a slf4j-impl (in wildfly-elytron-2.2.2.Final.jar!/org/slf4j/ILoggerFactory.class) -->
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>infinispan-remote-query</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorTest.java
index e3102dc2b8e..0a947f3ce4b 100644
--- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorTest.java
+++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/DeploymentErrorTest.java
@@ -47,6 +47,7 @@ import org.eclipse.jetty.toolchain.test.IO;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
+import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.util.resource.PathResource;
 import org.eclipse.jetty.webapp.AbstractConfiguration;
 import org.eclipse.jetty.webapp.Configuration;
@@ -126,7 +127,7 @@ public class DeploymentErrorTest
     {
         if (stacklessLogging != null)
             stacklessLogging.close();
-        server.stop();
+        LifeCycle.stop(server);
     }
 
     private void copyBadApp(String sourceXml, Path docroots)