From a16abe16935fcfda4125dbd1c28b4f3344567dea Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 19 Mar 2020 17:46:41 -0500 Subject: [PATCH 1/9] Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency. + Mark as a test dependency Signed-off-by: Joakim Erdfelt --- .../jetty-alpn-conscrypt-server/pom.xml | 10 ++- jetty-alpn/jetty-alpn-java-server/pom.xml | 9 ++ jetty-alpn/jetty-alpn-server/pom.xml | 9 ++ jetty-annotations/pom.xml | 9 ++ jetty-ant/pom.xml | 9 ++ jetty-cdi/pom.xml | 9 ++ .../jetty-gcloud-session-manager/pom.xml | 9 ++ jetty-hazelcast/pom.xml | 9 ++ jetty-http-spi/pom.xml | 10 +++ jetty-http/pom.xml | 4 + jetty-infinispan/infinispan-common/pom.xml | 9 ++ jetty-jaas/pom.xml | 12 ++- .../test/resources/jetty-logging.properties | 3 + .../test/resources/simplelogger.properties | 1 - jetty-jaspi/pom.xml | 9 ++ jetty-jmx/pom.xml | 4 + jetty-jndi/pom.xml | 10 ++- jetty-nosql/pom.xml | 19 +++-- jetty-openid/pom.xml | 9 ++ jetty-plus/pom.xml | 10 ++- jetty-quickstart/pom.xml | 10 ++- jetty-rewrite/pom.xml | 10 ++- jetty-runner/pom.xml | 9 ++ .../main/resources/jetty-logging.properties | 2 + jetty-server/pom.xml | 5 ++ .../eclipse/jetty/logging/Slf4jEffort.java | 83 ++++++++++--------- .../jetty-unixsocket-server/pom.xml | 9 ++ jetty-util/pom.xml | 4 +- .../websocket-javax-common/pom.xml | 10 ++- .../websocket-javax-server/pom.xml | 9 ++ jetty-websocket/websocket-javax-tests/pom.xml | 4 + .../websocket-jetty-client/pom.xml | 10 ++- .../websocket-jetty-common/pom.xml | 10 ++- .../websocket-jetty-server/pom.xml | 9 ++ jetty-websocket/websocket-jetty-tests/pom.xml | 5 ++ jetty-websocket/websocket-servlet/pom.xml | 9 ++ jetty-websocket/websocket-util/pom.xml | 9 ++ jetty-xml/pom.xml | 9 ++ tests/jetty-jmh/pom.xml | 8 ++ tests/test-distribution/pom.xml | 9 ++ tests/test-http-client-transport/pom.xml | 10 +++ tests/test-integration/pom.xml | 4 + tests/test-jmx/jmx-webapp/pom.xml | 9 ++ tests/test-quickstart/pom.xml | 9 +- .../test-mongodb-sessions/pom.xml | 9 ++ .../test-sessions-common/pom.xml | 5 +- .../test-websocket-webapp/pom.xml | 9 ++ 47 files changed, 401 insertions(+), 60 deletions(-) create mode 100644 jetty-jaas/src/test/resources/jetty-logging.properties delete mode 100644 jetty-jaas/src/test/resources/simplelogger.properties create mode 100644 jetty-runner/src/main/resources/jetty-logging.properties diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index b12dd062925..bf92fec813c 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -30,7 +30,15 @@ jetty-io ${project.version} - + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.http2 http2-server diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 918725febde..10725f09ccd 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -51,6 +51,15 @@ jetty-alpn-server ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.http2 http2-server diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 0cf6794b9fa..cd00d31091a 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -44,6 +44,15 @@ jetty-server ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 8eadf27f3b3..15e361f4cdb 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -69,6 +69,10 @@ org.ow2.asm asm-commons + + org.slf4j + slf4j-api + jakarta.transaction @@ -86,5 +90,10 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + test + diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index b66fb07eaeb..c4d79c713f4 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -78,5 +78,14 @@ jetty-annotations ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 21cd915ce5d..faf645f8f0e 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -32,6 +32,15 @@ ${project.version} compile + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index b4e02b8e072..5044d383aed 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -16,6 +16,10 @@ jetty-server ${project.version} + + org.slf4j + slf4j-api + com.google.cloud google-cloud-datastore @@ -80,6 +84,11 @@ jetty-test-helper test + + org.eclipse.jetty + jetty-slf4j-impl + test + diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index cbc3957758f..1bb1d405806 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -38,6 +38,15 @@ jetty-server ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty jetty-webapp diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 2fb509cd685..91572f0487a 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -35,6 +35,16 @@ ${project.version} provided + + org.slf4j + slf4j-api + provided + + + org.eclipse.jetty + jetty-slf4j-impl + test + javax.xml jaxws-api diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 34620564bc7..4ec93d056c1 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -25,6 +25,10 @@ jetty-io ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index 751d63b19e2..7fa7aab27cc 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -53,6 +53,15 @@ jetty-server ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.infinispan infinispan-client-hotrod diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 6662377bb20..0645ecf6288 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -42,13 +42,17 @@ - org.eclipse.jetty.toolchain - jetty-test-helper + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl test - org.slf4j - slf4j-simple + org.eclipse.jetty.toolchain + jetty-test-helper test diff --git a/jetty-jaas/src/test/resources/jetty-logging.properties b/jetty-jaas/src/test/resources/jetty-logging.properties new file mode 100644 index 00000000000..f0773d90fa5 --- /dev/null +++ b/jetty-jaas/src/test/resources/jetty-logging.properties @@ -0,0 +1,3 @@ +# Jetty Logging using jetty-slf4j-impl +org.eclipse.jetty.LEVEL=INFO +org.apache.directory.LEVEL=ERROR \ No newline at end of file diff --git a/jetty-jaas/src/test/resources/simplelogger.properties b/jetty-jaas/src/test/resources/simplelogger.properties deleted file mode 100644 index 921e53daa3a..00000000000 --- a/jetty-jaas/src/test/resources/simplelogger.properties +++ /dev/null @@ -1 +0,0 @@ -org.slf4j.simpleLogger.log.org.apache.directory=error \ No newline at end of file diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 0d16ccb6974..6a8f17b899b 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -50,6 +50,15 @@ jetty-security ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 9115002325a..9fac343c518 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -42,6 +42,10 @@ jetty-util ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-slf4j-impl diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index a9fa17ea26f..306faaf19b9 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -51,7 +51,15 @@ jetty-util ${project.version} - + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 1d3f099c606..af03a0f479c 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -21,11 +21,6 @@ jetty-server ${project.version} - - org.eclipse.jetty.toolchain - jetty-test-helper - test - org.eclipse.jetty jetty-jmx @@ -39,6 +34,20 @@ jar compile + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + org.eclipse.jetty.tests test-sessions-common diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index ac1cb6bebb6..14106194db4 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -66,6 +66,15 @@ jetty-util-ajax ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty jetty-servlet diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 5cae42b832e..106a4d50eee 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -68,7 +68,15 @@ jetty-webapp ${project.version} - + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.apache.derby derby diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 1134d4ff73e..f55c9242981 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -30,7 +30,15 @@ jetty-annotations ${project.version} - + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 76b9b905bc1..5083912a1a8 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -36,7 +36,15 @@ org.eclipse.jetty.toolchain jetty-servlet-api - + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.tests jetty-http-tools diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 96a76bed6f8..b979e13e777 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -131,5 +131,14 @@ apache-jstl ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + runtime + diff --git a/jetty-runner/src/main/resources/jetty-logging.properties b/jetty-runner/src/main/resources/jetty-logging.properties new file mode 100644 index 00000000000..1de0a5d8bb8 --- /dev/null +++ b/jetty-runner/src/main/resources/jetty-logging.properties @@ -0,0 +1,2 @@ +# Jetty Logging using jetty-slf4j-impl +org.eclipse.jetty.LEVEL=INFO \ No newline at end of file diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index ceccb93e0f3..f37980beea8 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -89,6 +89,11 @@ ${project.version} test + + org.eclipse.jetty + jetty-slf4j-impl + test + diff --git a/jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/Slf4jEffort.java b/jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/Slf4jEffort.java index 132f00f3450..8a19e45138c 100644 --- a/jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/Slf4jEffort.java +++ b/jetty-slf4j-impl/src/test/java/org/eclipse/jetty/logging/Slf4jEffort.java @@ -65,50 +65,57 @@ public class Slf4jEffort AtomicInteger countPomSlf4jImpls = new AtomicInteger(0); AtomicInteger countOldLogClassProps = new AtomicInteger(0); - getProjectsStream(root).forEach((pom) -> - { - Path project = pom.getParent(); - try + getProjectsStream(root) + .filter(pom -> { - Path testLoggingProps = project.resolve("src/test/resources/jetty-logging.properties"); - - boolean isMainSrcUsingLogging = getSources(project.resolve("src/main/java")).anyMatch(Slf4jEffort::isUsingLogging); - boolean isTestSrcUsingLogging = getSources(project.resolve("src/test/java")).anyMatch(Slf4jEffort::isUsingLogging); - - if (isMainSrcUsingLogging || isTestSrcUsingLogging) + String fullpath = pom.toString(); + return !((fullpath.contains("/jetty-osgi") || + fullpath.contains("/jetty-slf4j-impl/"))); + }) + .forEach((pom) -> + { + Path project = pom.getParent(); + try { - // Must include slf4j in module-info and pom - Path moduleInfo = project.resolve("src/main/java/module-info.java"); - if (Files.exists(moduleInfo) && isMainSrcUsingLogging && !isLoggingJpmsPresent(moduleInfo)) - { - System.err.printf("[Missing: JPMS] %s%n", moduleInfo); - countJpms.incrementAndGet(); - } + Path testLoggingProps = project.resolve("src/test/resources/jetty-logging.properties"); - if (!isSlf4jDepPresent(pom)) - { - // System.err.printf("[Missing: Dep: slf4j-api] %s%n", pom); - countPomSlf4jApis.incrementAndGet(); - } + boolean isMainSrcUsingLogging = getSources(project.resolve("src/main/java")).anyMatch(Slf4jEffort::isUsingLogging); + boolean isTestSrcUsingLogging = getSources(project.resolve("src/test/java")).anyMatch(Slf4jEffort::isUsingLogging); - if (isTestSrcUsingLogging && !isSlf4jImplDepPresent(pom)) + if (isMainSrcUsingLogging || isTestSrcUsingLogging) { - // System.err.printf("[Missing: Dep: jetty-slf4j-impl] %s%n", pom); - countPomSlf4jImpls.incrementAndGet(); - } + if (!isSlf4jImplDepPresent(pom)) + { + System.err.printf("[Missing: Dep: jetty-slf4j-impl] %s%n", pom); + countPomSlf4jImpls.incrementAndGet(); + } - if (Files.exists(testLoggingProps) && isOldLogClassPropPresent(testLoggingProps)) - { - System.err.printf("[Deprecated: log.class=LogImpl] %s%n", testLoggingProps); - countOldLogClassProps.incrementAndGet(); + // Must include slf4j in module-info and pom + Path moduleInfo = project.resolve("src/main/java/module-info.java"); + if (Files.exists(moduleInfo) && isMainSrcUsingLogging && !isLoggingJpmsPresent(moduleInfo)) + { + System.err.printf("[Missing: JPMS] %s%n", moduleInfo); + countJpms.incrementAndGet(); + } + + if (!isSlf4jDepPresent(pom)) + { + System.err.printf("[Missing: Dep: slf4j-api] %s%n", pom); + countPomSlf4jApis.incrementAndGet(); + } + + if (Files.exists(testLoggingProps) && isOldLogClassPropPresent(testLoggingProps)) + { + System.err.printf("[Deprecated: log.class=LogImpl] %s%n", testLoggingProps); + countOldLogClassProps.incrementAndGet(); + } } } - } - catch (IOException e) - { - e.printStackTrace(); - } - }); + catch (IOException e) + { + e.printStackTrace(); + } + }); System.out.printf("JPMS (module-info.java) to fix: %d%n", countJpms.get()); System.out.printf("POMS (pom.xml) - slf4j-api to fix: %d%n", countPomSlf4jApis.get()); @@ -184,7 +191,9 @@ public class Slf4jEffort String line; while ((line = reader.readLine()) != null) { - if (line.contains("requires org.slf4j;")) + if (line.contains("requires org.slf4j;") || + line.contains("requires transitive org.slf4j;") || + line.contains("requires static org.slf4j;")) { return true; } diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index 0ba25d24bbc..1453387204f 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -25,6 +25,15 @@ jetty-server ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 741117f0edf..51c3feb1b88 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -61,9 +61,6 @@ ${settings.localRepository} - - @{argLine} ${jetty.surefire.argLine} --add-modules org.slf4j - @@ -86,6 +83,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index 26688bbf644..d606965d46c 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -80,7 +80,15 @@ org.eclipse.jetty.toolchain jetty-javax-websocket-api - + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index 5f9b00e0a64..f33263ba474 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -34,6 +34,15 @@ org.eclipse.jetty.toolchain jetty-javax-websocket-api + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 23ced0fc942..44c56f0f952 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -15,6 +15,10 @@ + + org.slf4j + slf4j-api + org.eclipse.jetty.websocket websocket-javax-client diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index 450480ce620..ad9d334d39f 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -30,7 +30,15 @@ jetty-client ${project.version} - + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index 5fb6fb314c3..83c726eb91d 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -71,7 +71,15 @@ jetty-io ${project.version} - + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index 40a1c9324e5..811fa6c6f89 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -55,6 +55,15 @@ org.eclipse.jetty.toolchain jetty-servlet-api + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index 7c3588d6562..57b21525e60 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -15,6 +15,11 @@ + + org.slf4j + slf4j-api + test + org.eclipse.jetty.websocket websocket-jetty-api diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 12b696830b6..beeeab4b0fc 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -25,6 +25,15 @@ jetty-servlet ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-websocket/websocket-util/pom.xml b/jetty-websocket/websocket-util/pom.xml index dece207f4d3..9412101ce9f 100644 --- a/jetty-websocket/websocket-util/pom.xml +++ b/jetty-websocket/websocket-util/pom.xml @@ -51,6 +51,15 @@ websocket-core ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index c835bc526cc..3b178e25ed1 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -40,6 +40,15 @@ jetty-util ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty jetty-slf4j-impl diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index bc4827112ef..deca7abf110 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -97,6 +97,14 @@ org.eclipse.jetty.toolchain jetty-servlet-api + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 91f1ee72cfb..59abe41b08b 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -19,6 +19,10 @@ jetty-util ${project.version} + + org.slf4j + slf4j-api + org.apache.maven maven-artifact @@ -44,6 +48,11 @@ ${maven.resolver.version} + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty jetty-distribution diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 0df91f68a13..ceb4ed5efe4 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -41,6 +41,16 @@ + + org.slf4j + slf4j-api + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty jetty-alpn-java-client diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 9537a2bb6ae..51280d90db0 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -93,6 +93,10 @@ jetty-client ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-distribution diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index 38445f8c86f..c3478a6b970 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -25,6 +25,15 @@ jetty-jmx ${project.version} + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + jmx-webapp diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index dd977fb060a..5cee5d86f66 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -102,7 +102,14 @@ org.eclipse.jetty.toolchain jetty-test-helper - + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 1c1f7718f8e..46961d5b918 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -90,6 +90,15 @@ ${project.version} true + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-test-helper diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 906c26ddeb8..d47a3bae6fe 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -29,10 +29,13 @@ jetty-client ${project.version} + + org.slf4j + slf4j-api + org.eclipse.jetty jetty-slf4j-impl - ${project.version} org.eclipse.jetty.toolchain diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index 72852247e0e..5aa01418d9a 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -13,6 +13,15 @@ Test :: Jetty Websocket Simple Webapp + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + test + org.eclipse.jetty.toolchain jetty-javax-websocket-api From 874ae80ba43086d663303860dc13efb9e0b5c984 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 19 Mar 2020 18:49:51 -0500 Subject: [PATCH 2/9] Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency. + Mark as a test dependency Signed-off-by: Joakim Erdfelt --- examples/async-rest/async-rest-webapp/pom.xml | 8 ++++++++ tests/test-webapps/test-proxy-webapp/pom.xml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index fc23683060f..700e1ff10f1 100644 --- a/examples/async-rest/async-rest-webapp/pom.xml +++ b/examples/async-rest/async-rest-webapp/pom.xml @@ -16,6 +16,14 @@ + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + org.eclipse.jetty.example-async-rest example-async-rest-jar diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml index 9efbbf1e9b4..4bc4355b12f 100644 --- a/tests/test-webapps/test-proxy-webapp/pom.xml +++ b/tests/test-webapps/test-proxy-webapp/pom.xml @@ -34,6 +34,14 @@ + + org.slf4j + slf4j-api + + + org.eclipse.jetty + jetty-slf4j-impl + org.eclipse.jetty jetty-proxy From 2c600f2b6880b7e6b86ef73d16bff4d7da5ff6b9 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 20 Mar 2020 09:55:15 -0500 Subject: [PATCH 3/9] Issue #4685 - Mark jetty-slf4j-impl as test scope by default + Update logging in test-hazelcast-sessions + Update logging in test-infinispan-sessions Signed-off-by: Joakim Erdfelt --- examples/async-rest/async-rest-webapp/pom.xml | 1 + .../jetty-alpn-conscrypt-server/pom.xml | 1 - jetty-alpn/jetty-alpn-java-server/pom.xml | 1 - jetty-alpn/jetty-alpn-server/pom.xml | 1 - jetty-annotations/pom.xml | 1 - jetty-ant/pom.xml | 1 - jetty-cdi/pom.xml | 1 - jetty-client/pom.xml | 1 - .../jetty-gcloud-session-manager/pom.xml | 1 - jetty-hazelcast/pom.xml | 1 - jetty-http-spi/pom.xml | 1 - jetty-infinispan/infinispan-common/pom.xml | 1 - jetty-jaas/pom.xml | 1 - jetty-jaspi/pom.xml | 1 - jetty-jmx/pom.xml | 14 +++---- jetty-jndi/pom.xml | 1 - jetty-nosql/pom.xml | 1 - jetty-openid/pom.xml | 1 - jetty-plus/pom.xml | 1 - jetty-quickstart/pom.xml | 1 - jetty-rewrite/pom.xml | 1 - jetty-server/pom.xml | 1 - .../jetty-unixsocket-server/pom.xml | 1 - jetty-util/pom.xml | 1 - .../websocket-javax-common/pom.xml | 1 - .../websocket-javax-server/pom.xml | 1 - .../websocket-jetty-client/pom.xml | 1 - .../websocket-jetty-common/pom.xml | 1 - .../websocket-jetty-server/pom.xml | 1 - jetty-websocket/websocket-servlet/pom.xml | 1 - jetty-websocket/websocket-util/pom.xml | 1 - jetty-xml/pom.xml | 1 - pom.xml | 1 + tests/test-distribution/pom.xml | 1 - tests/test-quickstart/pom.xml | 19 +++++++++ .../test-file-sessions/.gitignore | 1 - .../test-sessions/test-file-sessions/pom.xml | 17 +++++++- .../test-gcloud-sessions/pom.xml | 5 +++ .../test-hazelcast-sessions/pom.xml | 25 ++++++++++-- .../session/HazelcastTestHelper.java | 9 +++++ .../test/resources/jetty-logging.properties | 6 ++- .../src/test/resources/logging.properties | 3 -- .../test-infinispan-sessions/pom.xml | 20 +++++++++- .../session/ClusteredOrphanedSessionTest.java | 5 +++ .../ClusteredSessionScavengingTest.java | 5 +++ .../InfinispanSessionDataStoreTest.java | 4 ++ .../jetty/server/session/LoggingUtil.java | 39 +++++++++++++++++++ ...emoteClusteredInvalidationSessionTest.java | 5 +++ .../RemoteClusteredSessionScavengingTest.java | 5 +++ .../RemoteInfinispanSessionDataStoreTest.java | 5 +++ .../test/resources/jetty-logging.properties | 6 +++ .../test-sessions/test-jdbc-sessions/pom.xml | 6 ++- .../test/resources/jetty-logging.properties | 2 + .../test-memcached-sessions/pom.xml | 10 +++-- .../test/resources/jetty-logging.properties | 2 + .../test-mongodb-sessions/pom.xml | 7 ++++ tests/test-webapps/test-proxy-webapp/pom.xml | 1 + 57 files changed, 198 insertions(+), 56 deletions(-) delete mode 100644 tests/test-sessions/test-file-sessions/.gitignore delete mode 100644 tests/test-sessions/test-hazelcast-sessions/src/test/resources/logging.properties create mode 100644 tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LoggingUtil.java create mode 100644 tests/test-sessions/test-infinispan-sessions/src/test/resources/jetty-logging.properties create mode 100644 tests/test-sessions/test-jdbc-sessions/src/test/resources/jetty-logging.properties create mode 100644 tests/test-sessions/test-memcached-sessions/src/test/resources/jetty-logging.properties diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index 700e1ff10f1..399ab7a53f2 100644 --- a/examples/async-rest/async-rest-webapp/pom.xml +++ b/examples/async-rest/async-rest-webapp/pom.xml @@ -23,6 +23,7 @@ org.eclipse.jetty jetty-slf4j-impl + compile org.eclipse.jetty.example-async-rest diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index bf92fec813c..b41c8077c1f 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -37,7 +37,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.http2 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 10725f09ccd..9d3359679b3 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -58,7 +58,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.http2 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index cd00d31091a..1a420c847e4 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -51,7 +51,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 15e361f4cdb..2583a0d4af2 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -93,7 +93,6 @@ org.eclipse.jetty jetty-slf4j-impl - test diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index c4d79c713f4..1e0af1ab54f 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -85,7 +85,6 @@ org.eclipse.jetty jetty-slf4j-impl - test diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index faf645f8f0e..690fbe7f05e 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -39,7 +39,6 @@ org.eclipse.jetty jetty-slf4j-impl - test diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index e859d380e22..63f60241e84 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -160,7 +160,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 5044d383aed..cccc65faa98 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -87,7 +87,6 @@ org.eclipse.jetty jetty-slf4j-impl - test diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index 1bb1d405806..8fd011ceb26 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -45,7 +45,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index 91572f0487a..f6887b855a0 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -43,7 +43,6 @@ org.eclipse.jetty jetty-slf4j-impl - test javax.xml diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index 7fa7aab27cc..e80aa34dbe8 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -60,7 +60,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.infinispan diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 0645ecf6288..9873b44faf8 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -48,7 +48,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 6a8f17b899b..179e5cd9e81 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -57,7 +57,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 9fac343c518..a7ed522fb6e 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -32,11 +32,6 @@ - - org.eclipse.jetty.toolchain - jetty-test-helper - test - org.eclipse.jetty jetty-util @@ -49,11 +44,12 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - provided - true - + + org.eclipse.jetty.toolchain + jetty-test-helper + test + com.openpojo openpojo diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 306faaf19b9..bdc52e0e08c 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -58,7 +58,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index af03a0f479c..c047f243acc 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -41,7 +41,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 14106194db4..c7bbb08a56d 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -73,7 +73,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 106a4d50eee..9b26e17c670 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -75,7 +75,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.apache.derby diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index f55c9242981..bee7796cb39 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -37,7 +37,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 5083912a1a8..da00cfa768a 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -43,7 +43,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.tests diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index f37980beea8..6db5eb4f7dc 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -92,7 +92,6 @@ org.eclipse.jetty jetty-slf4j-impl - test diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index 1453387204f..c0a231ae1b0 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -32,7 +32,6 @@ org.eclipse.jetty jetty-slf4j-impl - test diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 51c3feb1b88..fd19aa15832 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -83,7 +83,6 @@ org.eclipse.jetty jetty-slf4j-impl - test diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index d606965d46c..51c8690a656 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -87,7 +87,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index f33263ba474..17c1c9d1d52 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -41,7 +41,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index ad9d334d39f..4dea2f3983a 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -37,7 +37,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index 83c726eb91d..2b3cccce8bb 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -78,7 +78,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index 811fa6c6f89..c0382755b9e 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -62,7 +62,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index beeeab4b0fc..b823ae7c1e6 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -32,7 +32,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-util/pom.xml b/jetty-websocket/websocket-util/pom.xml index 9412101ce9f..e13e8f50533 100644 --- a/jetty-websocket/websocket-util/pom.xml +++ b/jetty-websocket/websocket-util/pom.xml @@ -58,7 +58,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty.toolchain diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 3b178e25ed1..184b543ef95 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -47,7 +47,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty diff --git a/pom.xml b/pom.xml index 122243794fb..677baad6835 100644 --- a/pom.xml +++ b/pom.xml @@ -956,6 +956,7 @@ org.eclipse.jetty jetty-slf4j-impl ${project.version} + test org.eclipse.jetty.toolchain diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index 59abe41b08b..b2dc2170b0a 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -51,7 +51,6 @@ org.eclipse.jetty jetty-slf4j-impl - test org.eclipse.jetty diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 5cee5d86f66..11c1ba6907d 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -20,95 +20,114 @@ org.eclipse.jetty jetty-quickstart ${project.version} + test org.eclipse.jetty jetty-webapp ${project.version} + test org.eclipse.jetty jetty-jmx ${project.version} + test org.eclipse.jetty jetty-plus ${project.version} + test org.eclipse.jetty jetty-annotations ${project.version} + test jakarta.transaction jakarta.transaction-api + test org.eclipse.jetty.tests test-mock-resources ${project.version} + test org.eclipse.jetty.orbit javax.mail.glassfish 1.4.1.v201005082020 + test org.eclipse.jetty jetty-servlets ${project.version} + test org.eclipse.jetty.tests test-jndi-webapp ${project.version} war + test org.eclipse.jetty.tests test-spec-webapp ${project.version} war + test org.eclipse.jetty test-jetty-webapp ${project.version} war + test org.eclipse.jetty.websocket websocket-javax-server ${project.version} + test org.eclipse.jetty.websocket websocket-jetty-server ${project.version} + test org.eclipse.jetty apache-jsp ${project.version} + test org.eclipse.jetty apache-jstl ${project.version} + test org.eclipse.jetty.toolchain jetty-test-helper + test org.slf4j slf4j-api + test org.eclipse.jetty jetty-slf4j-impl + test diff --git a/tests/test-sessions/test-file-sessions/.gitignore b/tests/test-sessions/test-file-sessions/.gitignore deleted file mode 100644 index b83d22266ac..00000000000 --- a/tests/test-sessions/test-file-sessions/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/tests/test-sessions/test-file-sessions/pom.xml b/tests/test-sessions/test-file-sessions/pom.xml index d79168404c6..ed34559aa23 100644 --- a/tests/test-sessions/test-file-sessions/pom.xml +++ b/tests/test-sessions/test-file-sessions/pom.xml @@ -29,27 +29,40 @@ org.eclipse.jetty jetty-server ${project.version} + test org.eclipse.jetty jetty-webapp ${project.version} + test org.eclipse.jetty jetty-client ${project.version} + test org.eclipse.jetty.tests test-sessions-common ${project.version} + test + + + org.slf4j + slf4j-api + test + + + org.eclipse.jetty + jetty-slf4j-impl + test org.eclipse.jetty.toolchain jetty-test-helper - - compile + test diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index 6b5ae8f14da..f7f47ce19af 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -36,26 +36,31 @@ org.eclipse.jetty jetty-server ${project.version} + test org.eclipse.jetty jetty-webapp ${project.version} + test org.eclipse.jetty jetty-client ${project.version} + test org.eclipse.jetty.tests test-sessions-common ${project.version} + test org.eclipse.jetty.gcloud jetty-gcloud-session-manager ${project.version} + test diff --git a/tests/test-sessions/test-hazelcast-sessions/pom.xml b/tests/test-sessions/test-hazelcast-sessions/pom.xml index fa96894adad..22f7719be61 100644 --- a/tests/test-sessions/test-hazelcast-sessions/pom.xml +++ b/tests/test-sessions/test-hazelcast-sessions/pom.xml @@ -54,9 +54,6 @@ 45 240 - - ${project.build.testOutputDirectory}/logging.properties - @@ -66,38 +63,60 @@ org.eclipse.jetty jetty-server ${project.version} + test org.eclipse.jetty jetty-webapp ${project.version} + test org.eclipse.jetty jetty-client ${project.version} + test org.eclipse.jetty.tests test-sessions-common ${project.version} + test org.eclipse.jetty jetty-hazelcast ${project.version} + test org.eclipse.jetty jetty-jmx ${project.version} true + test org.eclipse.jetty.toolchain jetty-test-helper test + + org.slf4j + slf4j-api + test + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + test + + + org.eclipse.jetty + jetty-slf4j-impl + test + diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastTestHelper.java b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastTestHelper.java index 9c51cf3078f..87fa2e2d4d3 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastTestHelper.java +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastTestHelper.java @@ -53,6 +53,15 @@ public class HazelcastTestHelper static { + // Wire up hazelcast logging to slf4j + System.setProperty("hazelcast.logging.class", "com.hazelcast.logging.Slf4jFactory"); + + // Wire up java.util.logging (used by hazelcast libs) to slf4j. + if (!org.slf4j.bridge.SLF4JBridgeHandler.isInstalled()) + { + org.slf4j.bridge.SLF4JBridgeHandler.install(); + } + _serializerConfig = new SerializerConfig().setImplementation(new SessionDataSerializer()).setTypeClass(SessionData.class); Config config = new Config(); config.setInstanceName(_hazelcastInstanceName); diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties b/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties index c2be11c689a..93a1284d6c4 100644 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties +++ b/tests/test-sessions/test-hazelcast-sessions/src/test/resources/jetty-logging.properties @@ -1 +1,5 @@ -org.eclipse.jetty.LEVEL=INFO \ No newline at end of file +# Jetty Logging using jetty-slf4j-impl +org.eclipse.jetty.logging.appender.NAME_CONDENSE=false +org.eclipse.jetty.logging.appender.MESSAGE_ESCAPE=false +# org.eclipse.jetty.LEVEL=WARN +log.LEVEL=WARN diff --git a/tests/test-sessions/test-hazelcast-sessions/src/test/resources/logging.properties b/tests/test-sessions/test-hazelcast-sessions/src/test/resources/logging.properties deleted file mode 100644 index 256dbe49265..00000000000 --- a/tests/test-sessions/test-hazelcast-sessions/src/test/resources/logging.properties +++ /dev/null @@ -1,3 +0,0 @@ -handlers=java.util.logging.ConsoleHandler -.level=INFO -com.hazelcast.level=SEVERE \ No newline at end of file diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index c414f7f5848..f30c57237aa 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -65,32 +65,38 @@ org.eclipse.jetty jetty-server ${project.version} + test org.eclipse.jetty jetty-webapp ${project.version} + test org.eclipse.jetty jetty-client ${project.version} + test org.eclipse.jetty.tests test-sessions-common ${project.version} + test org.eclipse.jetty infinispan-remote-query ${project.version} + test org.eclipse.jetty jetty-jmx ${project.version} true + test org.eclipse.jetty.toolchain @@ -129,8 +135,18 @@ org.slf4j - slf4j-jdk14 - 1.7.25 + slf4j-api + test + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + test + + + org.eclipse.jetty + jetty-slf4j-impl test diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java index 26b256a3e21..a9bdd98248b 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredOrphanedSessionTest.java @@ -27,6 +27,11 @@ import org.junit.jupiter.api.BeforeAll; */ public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessionTest { + static + { + LoggingUtil.init(); + } + public static InfinispanTestSupport __testSupport; @BeforeAll diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java index 965962593fd..fe89e2bb4a5 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java @@ -28,6 +28,11 @@ import org.junit.jupiter.api.Test; */ public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest { + static + { + LoggingUtil.init(); + } + public InfinispanTestSupport _testSupport; @BeforeEach diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanSessionDataStoreTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanSessionDataStoreTest.java index 1d578ea2f14..5bbbf4d0252 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanSessionDataStoreTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/InfinispanSessionDataStoreTest.java @@ -41,6 +41,10 @@ import static org.junit.jupiter.api.Assertions.fail; */ public class InfinispanSessionDataStoreTest extends AbstractSessionDataStoreTest { + static + { + LoggingUtil.init(); + } public InfinispanTestSupport _testSupport; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LoggingUtil.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LoggingUtil.java new file mode 100644 index 00000000000..d63448fb665 --- /dev/null +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/LoggingUtil.java @@ -0,0 +1,39 @@ +// +// ======================================================================== +// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under +// the terms of the Eclipse Public License 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0 +// +// This Source Code may also be made available under the following +// Secondary Licenses when the conditions for such availability set +// forth in the Eclipse Public License, v. 2.0 are satisfied: +// the Apache License v2.0 which is available at +// https://www.apache.org/licenses/LICENSE-2.0 +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.server.session; + +public final class LoggingUtil +{ + /** + * It's easier to setup logging in code for this test project, + * then it is to setup the various system properties and files for every test + * execution (maven, CI, and IDE). + */ + public static void init() + { + // Wire up jboss logging (used by infinispan) to slf4j + System.setProperty("org.jboss.logging.provider", "slf4j"); + + // Wire up java.util.logging (used by hibernate, infinispan, and others) to slf4j. + if (!org.slf4j.bridge.SLF4JBridgeHandler.isInstalled()) + { + org.slf4j.bridge.SLF4JBridgeHandler.install(); + } + } +} diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredInvalidationSessionTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredInvalidationSessionTest.java index 61ccf05ed5b..5e8d48610ca 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredInvalidationSessionTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredInvalidationSessionTest.java @@ -19,6 +19,7 @@ package org.eclipse.jetty.server.session.remote; import org.eclipse.jetty.server.session.AbstractClusteredInvalidationSessionTest; +import org.eclipse.jetty.server.session.LoggingUtil; import org.eclipse.jetty.server.session.SessionDataStoreFactory; import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory; import org.junit.jupiter.api.AfterAll; @@ -29,6 +30,10 @@ import org.junit.jupiter.api.BeforeAll; */ public class RemoteClusteredInvalidationSessionTest extends AbstractClusteredInvalidationSessionTest { + static + { + LoggingUtil.init(); + } public static RemoteInfinispanTestSupport __testSupport; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredSessionScavengingTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredSessionScavengingTest.java index d7ba530c638..73fe0223811 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredSessionScavengingTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteClusteredSessionScavengingTest.java @@ -19,6 +19,7 @@ package org.eclipse.jetty.server.session.remote; import org.eclipse.jetty.server.session.AbstractClusteredSessionScavengingTest; +import org.eclipse.jetty.server.session.LoggingUtil; import org.eclipse.jetty.server.session.SessionDataStoreFactory; import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory; import org.junit.jupiter.api.AfterAll; @@ -29,6 +30,10 @@ import org.junit.jupiter.api.BeforeAll; */ public class RemoteClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest { + static + { + LoggingUtil.init(); + } public static RemoteInfinispanTestSupport __testSupport; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInfinispanSessionDataStoreTest.java b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInfinispanSessionDataStoreTest.java index 621c58add18..91f0235d8a8 100644 --- a/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInfinispanSessionDataStoreTest.java +++ b/tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/remote/RemoteInfinispanSessionDataStoreTest.java @@ -20,6 +20,7 @@ package org.eclipse.jetty.server.session.remote; import org.eclipse.jetty.server.session.AbstractSessionDataStoreFactory; import org.eclipse.jetty.server.session.AbstractSessionDataStoreTest; +import org.eclipse.jetty.server.session.LoggingUtil; import org.eclipse.jetty.server.session.SessionContext; import org.eclipse.jetty.server.session.SessionData; import org.eclipse.jetty.server.session.SessionDataStore; @@ -45,6 +46,10 @@ import static org.junit.jupiter.api.Assertions.fail; */ public class RemoteInfinispanSessionDataStoreTest extends AbstractSessionDataStoreTest { + static + { + LoggingUtil.init(); + } public static RemoteInfinispanTestSupport __testSupport; diff --git a/tests/test-sessions/test-infinispan-sessions/src/test/resources/jetty-logging.properties b/tests/test-sessions/test-infinispan-sessions/src/test/resources/jetty-logging.properties new file mode 100644 index 00000000000..a5e96346170 --- /dev/null +++ b/tests/test-sessions/test-infinispan-sessions/src/test/resources/jetty-logging.properties @@ -0,0 +1,6 @@ +# Jetty Logging using jetty-slf4j-impl +org.eclipse.jetty.logging.appender.NAME_CONDENSE=false +org.eclipse.jetty.LEVEL=WARN +log.LEVEL=INFO +# org.hibernate.LEVEL=WARN +# org.infinispan.LEVEL=DEBUG \ No newline at end of file diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index c2c2e8007f3..8eb0cc52e99 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -29,25 +29,30 @@ org.eclipse.jetty jetty-server ${project.version} + test org.eclipse.jetty jetty-webapp ${project.version} + test org.eclipse.jetty jetty-client ${project.version} + test org.eclipse.jetty.tests test-sessions-common ${project.version} + test org.slf4j slf4j-api + test org.apache.derby @@ -62,7 +67,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} test diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/resources/jetty-logging.properties b/tests/test-sessions/test-jdbc-sessions/src/test/resources/jetty-logging.properties new file mode 100644 index 00000000000..56cc73e5d68 --- /dev/null +++ b/tests/test-sessions/test-jdbc-sessions/src/test/resources/jetty-logging.properties @@ -0,0 +1,2 @@ +# Jetty Logging using jetty-slf4j-impl +#org.eclipse.jetty.LEVEL=DEBUG diff --git a/tests/test-sessions/test-memcached-sessions/pom.xml b/tests/test-sessions/test-memcached-sessions/pom.xml index 60ac2f524da..6226deb71b9 100644 --- a/tests/test-sessions/test-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-memcached-sessions/pom.xml @@ -36,26 +36,31 @@ org.eclipse.jetty jetty-server ${project.version} + test org.eclipse.jetty jetty-webapp ${project.version} + test org.eclipse.jetty jetty-client ${project.version} + test org.eclipse.jetty.tests test-sessions-common ${project.version} + test org.eclipse.jetty.memcached jetty-memcached-sessions ${project.version} + test org.eclipse.jetty.toolchain @@ -63,9 +68,8 @@ test - org.slf4j - slf4j-simple - 1.7.9 + org.eclipse.jetty + jetty-slf4j-impl test diff --git a/tests/test-sessions/test-memcached-sessions/src/test/resources/jetty-logging.properties b/tests/test-sessions/test-memcached-sessions/src/test/resources/jetty-logging.properties new file mode 100644 index 00000000000..56cc73e5d68 --- /dev/null +++ b/tests/test-sessions/test-memcached-sessions/src/test/resources/jetty-logging.properties @@ -0,0 +1,2 @@ +# Jetty Logging using jetty-slf4j-impl +#org.eclipse.jetty.LEVEL=DEBUG diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 46961d5b918..11e301fe167 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -63,36 +63,43 @@ org.eclipse.jetty jetty-server ${project.version} + test org.eclipse.jetty jetty-webapp ${project.version} + test org.eclipse.jetty jetty-client ${project.version} + test org.eclipse.jetty.tests test-sessions-common ${project.version} + test org.eclipse.jetty jetty-nosql ${project.version} + test org.eclipse.jetty jetty-jmx ${project.version} true + test org.slf4j slf4j-api + test org.eclipse.jetty diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml index 4bc4355b12f..5fc4a70de4b 100644 --- a/tests/test-webapps/test-proxy-webapp/pom.xml +++ b/tests/test-webapps/test-proxy-webapp/pom.xml @@ -41,6 +41,7 @@ org.eclipse.jetty jetty-slf4j-impl + compile org.eclipse.jetty From 44d2171986c406dd61a6f27b91abf40caea09a71 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 20 Mar 2020 10:05:32 -0500 Subject: [PATCH 4/9] Issue #4685 - jetty-http-spi logging for both jetty and jul Signed-off-by: Joakim Erdfelt --- jetty-http-spi/pom.xml | 7 ++++ .../eclipse/jetty/http/spi/LoggingUtil.java | 34 +++++++++++++++++++ .../eclipse/jetty/http/spi/SPIServerTest.java | 5 +++ .../TestEndpointMultiplePublishProblem.java | 4 +++ .../eclipse/jetty/http/spi/TestSPIServer.java | 4 +++ .../test/resources/jetty-logging.properties | 5 +++ .../test/resources/jetty-logging.properties | 3 ++ 7 files changed, 62 insertions(+) create mode 100644 jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/LoggingUtil.java create mode 100644 jetty-http-spi/src/test/resources/jetty-logging.properties create mode 100644 tests/test-sessions/test-file-sessions/src/test/resources/jetty-logging.properties diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index f6887b855a0..7ae35abd45d 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -40,9 +40,16 @@ slf4j-api provided + + org.slf4j + jul-to-slf4j + ${slf4j.version} + test + org.eclipse.jetty jetty-slf4j-impl + test javax.xml diff --git a/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/LoggingUtil.java b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/LoggingUtil.java new file mode 100644 index 00000000000..b3c27d24688 --- /dev/null +++ b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/LoggingUtil.java @@ -0,0 +1,34 @@ +// +// ======================================================================== +// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under +// the terms of the Eclipse Public License 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0 +// +// This Source Code may also be made available under the following +// Secondary Licenses when the conditions for such availability set +// forth in the Eclipse Public License, v. 2.0 are satisfied: +// the Apache License v2.0 which is available at +// https://www.apache.org/licenses/LICENSE-2.0 +// +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 +// ======================================================================== +// + +package org.eclipse.jetty.http.spi; + +public final class LoggingUtil +{ + /** + * It's easier to setup logging in code for this test project, + * then it is to setup the various system properties and files for every test + * execution (maven, CI, and IDE). + */ + public static void init() + { + // Wire up java.util.logging (used by javax.xml.soap others) to slf4j. + org.slf4j.bridge.SLF4JBridgeHandler.removeHandlersForRootLogger(); + org.slf4j.bridge.SLF4JBridgeHandler.install(); + } +} diff --git a/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/SPIServerTest.java b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/SPIServerTest.java index f99c7a4825c..9933369a5c7 100644 --- a/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/SPIServerTest.java +++ b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/SPIServerTest.java @@ -44,6 +44,11 @@ import static org.hamcrest.Matchers.is; public class SPIServerTest { + static + { + LoggingUtil.init(); + } + String host = "localhost"; HttpServer server; int port; diff --git a/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestEndpointMultiplePublishProblem.java b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestEndpointMultiplePublishProblem.java index 580fbe68dd4..702d90f01ed 100644 --- a/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestEndpointMultiplePublishProblem.java +++ b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestEndpointMultiplePublishProblem.java @@ -41,6 +41,10 @@ import org.junit.jupiter.api.Test; public class TestEndpointMultiplePublishProblem { + static + { + LoggingUtil.init(); + } private static String default_impl = System.getProperty("com.sun.net.httpserver.HttpServerProvider"); diff --git a/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestSPIServer.java b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestSPIServer.java index c6c1ee6308c..0893db6aa2f 100644 --- a/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestSPIServer.java +++ b/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/TestSPIServer.java @@ -42,6 +42,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSPIServer { + static + { + LoggingUtil.init(); + } /** * Create a server that has a null InetSocketAddress, then diff --git a/jetty-http-spi/src/test/resources/jetty-logging.properties b/jetty-http-spi/src/test/resources/jetty-logging.properties new file mode 100644 index 00000000000..f602bee5c31 --- /dev/null +++ b/jetty-http-spi/src/test/resources/jetty-logging.properties @@ -0,0 +1,5 @@ +# Jetty Logging using jetty-slf4j-impl +org.eclipse.jetty.logging.appender.NAME_CONDENSE=false +org.eclipse.jetty.logging.appender.MESSAGE_ESCAPE=false +# org.eclipse.jetty.LEVEL=WARN +log.LEVEL=INFO diff --git a/tests/test-sessions/test-file-sessions/src/test/resources/jetty-logging.properties b/tests/test-sessions/test-file-sessions/src/test/resources/jetty-logging.properties new file mode 100644 index 00000000000..80576de17b7 --- /dev/null +++ b/tests/test-sessions/test-file-sessions/src/test/resources/jetty-logging.properties @@ -0,0 +1,3 @@ +# Jetty Logging using jetty-slf4j-impl +# org.eclipse.jetty.LEVEL=WARN +log.LEVEL=WARN From 9492a5379ccacf989802de32310abc5810c6e0db Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 20 Mar 2020 10:42:36 -0500 Subject: [PATCH 5/9] Issue #4685 - eliminate in jetty-slf4j-impl Signed-off-by: Joakim Erdfelt --- apache-jsp/pom.xml | 6 ------ jetty-alpn/jetty-alpn-client/pom.xml | 2 -- jetty-alpn/jetty-alpn-conscrypt-client/pom.xml | 2 -- jetty-alpn/jetty-alpn-java-client/pom.xml | 2 -- jetty-deploy/pom.xml | 2 -- jetty-fcgi/fcgi-client/pom.xml | 2 -- jetty-fcgi/fcgi-server/pom.xml | 2 -- jetty-http/pom.xml | 2 -- jetty-http2/http2-client/pom.xml | 2 -- jetty-http2/http2-common/pom.xml | 2 -- jetty-http2/http2-hpack/pom.xml | 2 -- jetty-http2/http2-http-client-transport/pom.xml | 2 -- jetty-http2/http2-server/pom.xml | 2 -- jetty-io/pom.xml | 2 -- jetty-proxy/pom.xml | 2 -- jetty-security/pom.xml | 2 -- jetty-servlet/pom.xml | 2 -- jetty-servlets/pom.xml | 2 -- jetty-spring/pom.xml | 2 -- jetty-unixsocket/jetty-unixsocket-client/pom.xml | 2 -- jetty-unixsocket/jetty-unixsocket-common/pom.xml | 2 -- jetty-util-ajax/pom.xml | 2 -- jetty-webapp/pom.xml | 2 -- jetty-websocket/websocket-core/pom.xml | 2 -- jetty-websocket/websocket-javax-tests/pom.xml | 1 - jetty-websocket/websocket-jetty-tests/pom.xml | 2 -- jetty-xml/pom.xml | 2 -- tests/test-http-client-transport/pom.xml | 2 -- tests/test-integration/pom.xml | 2 -- 29 files changed, 61 deletions(-) diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index 5b38c489a61..f9358dbc066 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -85,10 +85,6 @@ jetty-annotations ${project.version} - - org.slf4j - slf4j-api - org.eclipse.jetty @@ -112,8 +108,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index e7201256539..d0ca4eb055c 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -58,8 +58,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 8251b50b33a..609fd0a4887 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -40,8 +40,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 95928e95608..7277f1d2201 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -54,8 +54,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 7a229ce4da3..463a7ae3cf0 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -63,8 +63,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index cb1adfc13ae..ae2fa197183 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -42,8 +42,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index b01bfa9050b..5dc9e939ed9 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -47,8 +47,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 4ec93d056c1..e96a7cdfd85 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -33,8 +33,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 541f701eee5..b5960b7943c 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -47,8 +47,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 30d716433d2..7bc03b401c1 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -30,8 +30,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index c3c2f088d34..c8c578fe5bd 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -62,8 +62,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index d4c7a55ad7b..69d9fcfc507 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -44,8 +44,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index ccbaeed6add..f4054125cac 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -80,8 +80,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 77e73ece8aa..8656e9d890f 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -25,8 +25,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 49da3737eb8..d906e5e0203 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -77,8 +77,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index a173d4ea82c..2a49538b27a 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -58,8 +58,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.tests diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index ec86bc7bc96..0b693466f5d 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -60,8 +60,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 037337044db..25074a3f648 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -71,8 +71,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index ac54aed8a9b..6e2f3222402 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -70,8 +70,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index 28ea94f76f8..2d7ccbc87fe 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -39,8 +39,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 2469773e7ed..003bfa7ad6b 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -36,8 +36,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 3f4a7e5d7d7..8c10cf82694 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -42,8 +42,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index d81876c4978..92cd92b1348 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -94,8 +94,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-core/pom.xml b/jetty-websocket/websocket-core/pom.xml index db70afa34be..09ee26d7a7e 100644 --- a/jetty-websocket/websocket-core/pom.xml +++ b/jetty-websocket/websocket-core/pom.xml @@ -54,8 +54,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 44c56f0f952..128064d2d4b 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -41,7 +41,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index 57b21525e60..cbac54f71a4 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -68,11 +68,9 @@ ${project.version} test - org.eclipse.jetty jetty-slf4j-impl - ${project.version} test diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 184b543ef95..57b6e9ea51c 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -51,8 +51,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index ceb4ed5efe4..9f5dac93305 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -114,8 +114,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 51280d90db0..b3ca07dd76f 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -112,8 +112,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} - test org.eclipse.jetty.toolchain From 99f1f8b89724e244d02a4dadb337720b1bd30ddb Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 20 Mar 2020 11:07:25 -0500 Subject: [PATCH 6/9] Issue #4685 - Cleanup from review Signed-off-by: Joakim Erdfelt --- jetty-home/pom.xml | 1 - jetty-websocket/websocket-jetty-tests/pom.xml | 1 - jetty-xml/pom.xml | 4 ---- tests/test-http-client-transport/pom.xml | 6 ------ tests/test-jmx/jmx-webapp/pom.xml | 2 +- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index dc26067f8f8..d747c716dd3 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -633,7 +633,6 @@ org.eclipse.jetty jetty-slf4j-impl - ${project.version} org.eclipse.jetty diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index cbac54f71a4..077a5f427fd 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -71,7 +71,6 @@ org.eclipse.jetty jetty-slf4j-impl - test diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 57b6e9ea51c..59ddd729879 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -48,10 +48,6 @@ org.eclipse.jetty jetty-slf4j-impl - - org.eclipse.jetty - jetty-slf4j-impl - org.eclipse.jetty.toolchain jetty-test-helper diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 9f5dac93305..4cd99134fb4 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -46,11 +46,6 @@ slf4j-api test - - org.eclipse.jetty - jetty-slf4j-impl - test - org.eclipse.jetty jetty-alpn-java-client @@ -118,7 +113,6 @@ org.eclipse.jetty.toolchain jetty-test-helper - test diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index c3478a6b970..d04fa306752 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -32,7 +32,7 @@ org.eclipse.jetty jetty-slf4j-impl - test + compile From 43419802b7f90fe0e2cb3c0b854b91351c277d29 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 20 Mar 2020 11:12:08 -0500 Subject: [PATCH 7/9] Issue #4685 - Declare for jetty-slf4j-impl everywhere Signed-off-by: Joakim Erdfelt --- apache-jsp/pom.xml | 1 + examples/embedded/pom.xml | 1 + jetty-alpn/jetty-alpn-client/pom.xml | 1 + jetty-alpn/jetty-alpn-conscrypt-client/pom.xml | 1 + jetty-alpn/jetty-alpn-conscrypt-server/pom.xml | 1 + jetty-alpn/jetty-alpn-java-client/pom.xml | 1 + jetty-alpn/jetty-alpn-java-server/pom.xml | 1 + jetty-alpn/jetty-alpn-server/pom.xml | 1 + jetty-annotations/pom.xml | 1 + jetty-ant/pom.xml | 1 + jetty-cdi/pom.xml | 1 + jetty-client/pom.xml | 1 + jetty-deploy/pom.xml | 1 + jetty-fcgi/fcgi-client/pom.xml | 1 + jetty-fcgi/fcgi-server/pom.xml | 1 + jetty-gcloud/jetty-gcloud-session-manager/pom.xml | 1 + jetty-hazelcast/pom.xml | 1 + jetty-home/pom.xml | 1 + jetty-http/pom.xml | 1 + jetty-http2/http2-client/pom.xml | 1 + jetty-http2/http2-common/pom.xml | 1 + jetty-http2/http2-hpack/pom.xml | 1 + jetty-http2/http2-http-client-transport/pom.xml | 1 + jetty-http2/http2-server/pom.xml | 1 + jetty-infinispan/infinispan-common/pom.xml | 1 + jetty-io/pom.xml | 1 + jetty-jaas/pom.xml | 1 + jetty-jaspi/pom.xml | 1 + jetty-jmx/pom.xml | 1 + jetty-jndi/pom.xml | 1 + jetty-nosql/pom.xml | 1 + jetty-openid/pom.xml | 1 + jetty-plus/pom.xml | 1 + jetty-proxy/pom.xml | 1 + jetty-quickstart/pom.xml | 1 + jetty-rewrite/pom.xml | 1 + jetty-security/pom.xml | 1 + jetty-server/pom.xml | 1 + jetty-servlet/pom.xml | 1 + jetty-servlets/pom.xml | 1 + jetty-spring/pom.xml | 1 + jetty-unixsocket/jetty-unixsocket-client/pom.xml | 1 + jetty-unixsocket/jetty-unixsocket-common/pom.xml | 1 + jetty-unixsocket/jetty-unixsocket-server/pom.xml | 1 + jetty-util-ajax/pom.xml | 1 + jetty-util/pom.xml | 1 + jetty-webapp/pom.xml | 1 + jetty-websocket/websocket-core/pom.xml | 1 + jetty-websocket/websocket-javax-common/pom.xml | 1 + jetty-websocket/websocket-javax-server/pom.xml | 1 + jetty-websocket/websocket-javax-tests/pom.xml | 1 + jetty-websocket/websocket-jetty-client/pom.xml | 1 + jetty-websocket/websocket-jetty-common/pom.xml | 1 + jetty-websocket/websocket-jetty-server/pom.xml | 1 + jetty-websocket/websocket-jetty-tests/pom.xml | 1 + jetty-websocket/websocket-servlet/pom.xml | 1 + jetty-websocket/websocket-util/pom.xml | 1 + jetty-xml/pom.xml | 1 + tests/jetty-jmh/pom.xml | 1 + tests/test-distribution/pom.xml | 1 + tests/test-http-client-transport/pom.xml | 1 + tests/test-integration/pom.xml | 1 + tests/test-sessions/test-sessions-common/pom.xml | 1 + tests/test-webapps/test-jetty-webapp/pom.xml | 1 + 64 files changed, 64 insertions(+) diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index f9358dbc066..165dbb9c747 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -108,6 +108,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 7dceec94289..22bc490c200 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -22,6 +22,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index d0ca4eb055c..cc8e15c22df 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -58,6 +58,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml index 609fd0a4887..eb477113a3d 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml @@ -40,6 +40,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml index b41c8077c1f..bf92fec813c 100644 --- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml +++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml @@ -37,6 +37,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.http2 diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 7277f1d2201..5e33ec1daa9 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -54,6 +54,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 9d3359679b3..10725f09ccd 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -58,6 +58,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.http2 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 1a420c847e4..cd00d31091a 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -51,6 +51,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 2583a0d4af2..15e361f4cdb 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -93,6 +93,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 1e0af1ab54f..c4d79c713f4 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -85,6 +85,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 690fbe7f05e..faf645f8f0e 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -39,6 +39,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 63f60241e84..e859d380e22 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -160,6 +160,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 463a7ae3cf0..7fa35eebc5a 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -63,6 +63,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index ae2fa197183..4b20d57bad4 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -42,6 +42,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 5dc9e939ed9..a9b45403292 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -47,6 +47,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index cccc65faa98..5044d383aed 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -87,6 +87,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index 8fd011ceb26..1bb1d405806 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -45,6 +45,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index d747c716dd3..f7bdb194a0a 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -633,6 +633,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index e96a7cdfd85..b4c0b9677a6 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -33,6 +33,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index b5960b7943c..7686d41dc5b 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -47,6 +47,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 7bc03b401c1..ed81bead357 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -30,6 +30,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index c8c578fe5bd..0c49d1bb8fc 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -62,6 +62,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index 69d9fcfc507..cbc6246eef2 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -44,6 +44,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index f4054125cac..af5742f74e1 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -80,6 +80,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-infinispan/infinispan-common/pom.xml b/jetty-infinispan/infinispan-common/pom.xml index e80aa34dbe8..7fa7aab27cc 100644 --- a/jetty-infinispan/infinispan-common/pom.xml +++ b/jetty-infinispan/infinispan-common/pom.xml @@ -60,6 +60,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.infinispan diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 8656e9d890f..cd974cb34d6 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -25,6 +25,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 9873b44faf8..0645ecf6288 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -48,6 +48,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 179e5cd9e81..6a8f17b899b 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -57,6 +57,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index a7ed522fb6e..b0478007d16 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -44,6 +44,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index bdc52e0e08c..306faaf19b9 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -58,6 +58,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index c047f243acc..af03a0f479c 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -41,6 +41,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index c7bbb08a56d..14106194db4 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -73,6 +73,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 9b26e17c670..106a4d50eee 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -75,6 +75,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.apache.derby diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index d906e5e0203..4c15b738b9d 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -77,6 +77,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index bee7796cb39..f55c9242981 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -37,6 +37,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index da00cfa768a..5083912a1a8 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -43,6 +43,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.tests diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 2a49538b27a..15cae93142c 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -58,6 +58,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.tests diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 6db5eb4f7dc..f37980beea8 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -92,6 +92,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 0b693466f5d..811d74afee6 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -60,6 +60,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 25074a3f648..65ae2cbd51c 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -71,6 +71,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 6e2f3222402..301c2d79534 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -70,6 +70,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-unixsocket/jetty-unixsocket-client/pom.xml b/jetty-unixsocket/jetty-unixsocket-client/pom.xml index 2d7ccbc87fe..115d4c258a7 100644 --- a/jetty-unixsocket/jetty-unixsocket-client/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-client/pom.xml @@ -39,6 +39,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-unixsocket/jetty-unixsocket-common/pom.xml b/jetty-unixsocket/jetty-unixsocket-common/pom.xml index 003bfa7ad6b..742a1fd487e 100644 --- a/jetty-unixsocket/jetty-unixsocket-common/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-common/pom.xml @@ -36,6 +36,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-unixsocket/jetty-unixsocket-server/pom.xml b/jetty-unixsocket/jetty-unixsocket-server/pom.xml index c0a231ae1b0..1453387204f 100644 --- a/jetty-unixsocket/jetty-unixsocket-server/pom.xml +++ b/jetty-unixsocket/jetty-unixsocket-server/pom.xml @@ -32,6 +32,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 8c10cf82694..5e8243ece85 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -42,6 +42,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index fd19aa15832..51c3feb1b88 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -83,6 +83,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 92cd92b1348..76a0f1b4788 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -94,6 +94,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-core/pom.xml b/jetty-websocket/websocket-core/pom.xml index 09ee26d7a7e..2e976948002 100644 --- a/jetty-websocket/websocket-core/pom.xml +++ b/jetty-websocket/websocket-core/pom.xml @@ -54,6 +54,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml index 51c8690a656..d606965d46c 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-javax-common/pom.xml @@ -87,6 +87,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml index 17c1c9d1d52..f33263ba474 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-javax-server/pom.xml @@ -41,6 +41,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-javax-tests/pom.xml index 128064d2d4b..9ad3aef9aeb 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-javax-tests/pom.xml @@ -41,6 +41,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml index 4dea2f3983a..ad9d334d39f 100644 --- a/jetty-websocket/websocket-jetty-client/pom.xml +++ b/jetty-websocket/websocket-jetty-client/pom.xml @@ -37,6 +37,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml index 2b3cccce8bb..83c726eb91d 100644 --- a/jetty-websocket/websocket-jetty-common/pom.xml +++ b/jetty-websocket/websocket-jetty-common/pom.xml @@ -78,6 +78,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml index c0382755b9e..811fa6c6f89 100644 --- a/jetty-websocket/websocket-jetty-server/pom.xml +++ b/jetty-websocket/websocket-jetty-server/pom.xml @@ -62,6 +62,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-jetty-tests/pom.xml b/jetty-websocket/websocket-jetty-tests/pom.xml index 077a5f427fd..cbac54f71a4 100644 --- a/jetty-websocket/websocket-jetty-tests/pom.xml +++ b/jetty-websocket/websocket-jetty-tests/pom.xml @@ -71,6 +71,7 @@ org.eclipse.jetty jetty-slf4j-impl + test diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index b823ae7c1e6..beeeab4b0fc 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -32,6 +32,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-websocket/websocket-util/pom.xml b/jetty-websocket/websocket-util/pom.xml index e13e8f50533..9412101ce9f 100644 --- a/jetty-websocket/websocket-util/pom.xml +++ b/jetty-websocket/websocket-util/pom.xml @@ -58,6 +58,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index 59ddd729879..038206e3ecb 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -47,6 +47,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/tests/jetty-jmh/pom.xml b/tests/jetty-jmh/pom.xml index deca7abf110..edf3878dfd9 100644 --- a/tests/jetty-jmh/pom.xml +++ b/tests/jetty-jmh/pom.xml @@ -104,6 +104,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/tests/test-distribution/pom.xml b/tests/test-distribution/pom.xml index b2dc2170b0a..59abe41b08b 100644 --- a/tests/test-distribution/pom.xml +++ b/tests/test-distribution/pom.xml @@ -51,6 +51,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 4cd99134fb4..034b1425cd8 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -109,6 +109,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index b3ca07dd76f..e058f77776f 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -112,6 +112,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index d47a3bae6fe..9f1dd27c356 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -36,6 +36,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty.toolchain diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index dbe6348563a..93b8c75a880 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -141,6 +141,7 @@ org.eclipse.jetty jetty-slf4j-impl + test org.eclipse.jetty From 891aaa4ca7655a40a7ce2abbb13fdc00c9a114f7 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 20 Mar 2020 11:23:53 -0500 Subject: [PATCH 8/9] Issue #4685 - Removing exclusion on jetty-slf4j-impl Signed-off-by: Joakim Erdfelt --- jetty-start/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index c7b7b275b8b..25189169f40 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -77,10 +77,6 @@ org.slf4j slf4j-api - - org.eclipse.jetty - jetty-slf4j-impl - From 8456fcd03940f3b17e8aec204fabb8db6f2e93ea Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 20 Mar 2020 11:24:15 -0500 Subject: [PATCH 9/9] Issue #4685 - Adding jetty-slf4j-impl to test wars WEB-INF/lib/ Signed-off-by: Joakim Erdfelt --- tests/test-webapps/test-jetty-webapp/pom.xml | 2 +- tests/test-webapps/test-websocket-webapp/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index 93b8c75a880..e2e57d4e0fb 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -141,7 +141,7 @@ org.eclipse.jetty jetty-slf4j-impl - test + compile org.eclipse.jetty diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index 5aa01418d9a..d9a8d3cfb5d 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jetty jetty-slf4j-impl - test + compile org.eclipse.jetty.toolchain