From 5a94c92d7e7fa85cad8f370812cb46c52c3a4d29 Mon Sep 17 00:00:00 2001 From: Jonathan Gallimore Date: Mon, 23 Oct 2023 16:41:48 +0100 Subject: [PATCH 1/5] Update SLF4J to 2.0.9 --- boms/tomee-microprofile/pom.xml | 4 ++-- boms/tomee-plume/pom.xml | 4 ++-- boms/tomee-plus/pom.xml | 4 ++-- boms/tomee-webprofile/pom.xml | 4 ++-- pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml index 0b859ea6deb..0cc5f1a7fc4 100644 --- a/boms/tomee-microprofile/pom.xml +++ b/boms/tomee-microprofile/pom.xml @@ -1864,7 +1864,7 @@ org.slf4j slf4j-api - 1.7.36 + 2.0.9 * @@ -1875,7 +1875,7 @@ org.slf4j slf4j-jdk14 - 1.7.36 + 2.0.9 * diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml index 251ccfd17ef..f4067035c2c 100644 --- a/boms/tomee-plume/pom.xml +++ b/boms/tomee-plume/pom.xml @@ -2007,7 +2007,7 @@ org.slf4j slf4j-api - 1.7.36 + 2.0.9 * @@ -2018,7 +2018,7 @@ org.slf4j slf4j-jdk14 - 1.7.36 + 2.0.9 * diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index 1b06038bc33..d28da8349e4 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -2007,7 +2007,7 @@ org.slf4j slf4j-api - 1.7.36 + 2.0.9 * @@ -2018,7 +2018,7 @@ org.slf4j slf4j-jdk14 - 1.7.36 + 2.0.9 * diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml index 33cfd523d48..afae7923f7e 100644 --- a/boms/tomee-webprofile/pom.xml +++ b/boms/tomee-webprofile/pom.xml @@ -1237,7 +1237,7 @@ org.slf4j slf4j-api - 1.7.36 + 2.0.9 * @@ -1248,7 +1248,7 @@ org.slf4j slf4j-jdk14 - 1.7.36 + 2.0.9 * diff --git a/pom.xml b/pom.xml index 6f8fd219d5c..ab595b4140e 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ 2.7.2 - 1.7.36 + 2.0.9 1.2.17 2.20.0 1.2 From 21e2a315486314d7c9c3480f93e61cdf2909f23a Mon Sep 17 00:00:00 2001 From: Jonathan Gallimore Date: Wed, 25 Oct 2023 11:55:03 +0100 Subject: [PATCH 2/5] Always use SLF4J in the webapp if it is there --- .../util/classloader/URLClassLoaderFirst.java | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java index 62cf8c30db1..943efc597b0 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java @@ -154,7 +154,8 @@ public Class loadClass(final String name, final boolean resolve) throws Class } public static boolean shouldDelegateToTheContainer(final ClassLoader loader, final String name) { - return shouldSkipJsf(loader, name) || shouldSkipSlf4j(loader, name); + if (shouldSkipJsf(loader, name)) return true; + return false; } private Class loadFromParent(final String name, final boolean resolve) { @@ -596,27 +597,6 @@ public static boolean isFilterableResource(final String name) { && (FILTERABLE_RESOURCES.contains(name) || name.startsWith("META-INF/services/org.apache.myfaces.spi")); } - public static boolean shouldSkipSlf4j(final ClassLoader loader, final String name) { - if (name == null || !name.startsWith("org.slf4j.")) { - return false; - } - - try { // using getResource here just returns randomly the container one so we need getResources - final Enumeration resources = loader.getResources(SLF4J_BINDER_CLASS); - while (resources.hasMoreElements()) { - final URL resource = resources.nextElement(); - if (!resource.equals(SLF4J_CONTAINER)) { - // applicative slf4j - return false; - } - } - } catch (final Throwable e) { - // no-op - } - - return true; - } - // useful method for SPI public static Enumeration filterResources(final String name, final Enumeration result) { if (isFilterableResource(name)) { From 219957b64475e6277be799195624f531c9de3be3 Mon Sep 17 00:00:00 2001 From: Jonathan Gallimore Date: Fri, 27 Oct 2023 14:47:46 +0100 Subject: [PATCH 3/5] Add Arquillian tests for SLF4J logging changes --- .../tests/slf4j/BasicSlf4jWebappTest.java | 75 +++++++++++++++ .../arquillian/tests/slf4j/SimpleServlet.java | 50 ++++++++++ .../tests/slf4j/Slf4j1xLogbackWebappTest.java | 94 +++++++++++++++++++ .../tests/slf4j/Slf4j2xLogbackWebappTest.java | 94 +++++++++++++++++++ .../arquillian/tests/slf4j/logback.xml | 37 ++++++++ .../src/test/resources/slf4j1x-pom.xml | 47 ++++++++++ .../src/test/resources/slf4j2x-pom.xml | 47 ++++++++++ 7 files changed, 444 insertions(+) create mode 100644 arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java create mode 100644 arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java create mode 100644 arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j1xLogbackWebappTest.java create mode 100644 arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java create mode 100644 arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/slf4j/logback.xml create mode 100644 arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j1x-pom.xml create mode 100644 arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java new file mode 100644 index 00000000000..d1d168f4a71 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java @@ -0,0 +1,75 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.arquillian.tests.slf4j; + +import org.apache.ziplock.WebModule; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.net.URL; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +@RunWith(Arquillian.class) +public class BasicSlf4jWebappTest { + @ArquillianResource(SimpleServlet.class) + private URL url; + + @Deployment(testable = false) + public static WebArchive getArchive() { + final WebArchive archive = new WebModule(BasicSlf4jWebappTest.class.getSimpleName()).getArchive(); + archive.addClass(SimpleServlet.class); + archive.add(new ClassLoaderAsset("org/apache/openejb/arquillian/tests/slf4j/logback.xml"), "WEB-INF/logback.xml"); + System.out.println(archive.toString(true)); + return archive; + } + + @Test + public void validate() throws Exception { + final String launchProfile = System.getProperty("arquillian.launch"); + if ("tomee-embedded".equals(launchProfile)) { + System.out.println("Skipping this test in TomEE embedded"); + return; + } + + final InputStream is = new URL(url.toExternalForm() + "logtest").openStream(); + final ByteArrayOutputStream os = new ByteArrayOutputStream(); + + int bytesRead; + byte[] buffer = new byte[8192]; + while ((bytesRead = is.read(buffer)) > -1) { + os.write(buffer, 0, bytesRead); + } + + is.close(); + os.close(); + + final String output = new String(os.toByteArray(), "UTF-8"); + assertNotNull("Response shouldn't be null", output); + assertTrue("Output should contain: " + "It works!" + "\n" + output, output.contains("It works!")); + assertTrue("Output should contain: " + "Logger Factory: org.slf4j.jul.JDK14LoggerFactory" + "\n" + output, output.contains("Logger Factory: org.slf4j.jul.JDK14LoggerFactory")); + assertTrue("Output should contain: " + "slf4j-jdk14-2.0.9.jar" + "\n" + output, output.contains("slf4j-jdk14-2.0.9.jar")); + } +} diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java new file mode 100644 index 00000000000..971b58032fc --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java @@ -0,0 +1,50 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.arquillian.tests.slf4j; + +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.ILoggerFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.io.PrintWriter; + +@WebServlet(urlPatterns = "/logtest") +public class SimpleServlet extends HttpServlet { + + private static final Logger LOGGER = LoggerFactory.getLogger(SimpleServlet.class); + + @Override + protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException { + final ILoggerFactory iLoggerFactory = LoggerFactory.getILoggerFactory(); + final String loggerFactoryName = iLoggerFactory.getClass().getName(); + + LOGGER.info("Simple servlet called"); + LOGGER.info("Logger Factory: " + loggerFactoryName); + + final PrintWriter writer = resp.getWriter(); + writer.println("It works!\n" + + "Logger Factory: " + loggerFactoryName + "\n" + + "Protection Domain: " + iLoggerFactory.getClass().getProtectionDomain().toString()); + writer.flush(); + } +} diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j1xLogbackWebappTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j1xLogbackWebappTest.java new file mode 100644 index 00000000000..7997e01d862 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j1xLogbackWebappTest.java @@ -0,0 +1,94 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.arquillian.tests.slf4j; + +import org.apache.ziplock.WebModule; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.ResolutionException; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.InputStream; +import java.net.URL; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +@RunWith(Arquillian.class) +public class Slf4j1xLogbackWebappTest { + @ArquillianResource(SimpleServlet.class) + private URL url; + + @Deployment(testable = false) + public static WebArchive getArchive() { + File[] dependencies; + try { // try offline first since it is generally faster + dependencies = Maven.configureResolver() + .workOffline() + .loadPomFromFile("src/test/resources/slf4j1x-pom.xml") + .importCompileAndRuntimeDependencies().resolve().withTransitivity() + .asFile(); + } catch (ResolutionException re) { // try on central + dependencies = Maven.resolver() + .loadPomFromFile("src/test/resources/slf4j1x-pom.xml") + .importCompileAndRuntimeDependencies().resolve().withTransitivity() + .asFile(); + } + + + final WebArchive archive = new WebModule(BasicSlf4jWebappTest.class.getSimpleName()).getArchive(); + archive.addClass(SimpleServlet.class); + archive.add(new ClassLoaderAsset("org/apache/openejb/arquillian/tests/slf4j/logback.xml"), "WEB-INF/logback.xml"); + archive.addAsLibraries(dependencies); + System.out.println(archive.toString(true)); + return archive; + } + + @Test + public void validate() throws Exception { + final String launchProfile = System.getProperty("arquillian.launch"); + if ("tomee-embedded".equals(launchProfile)) { + System.out.println("Skipping this test in TomEE embedded"); + return; + } + + final InputStream is = new URL(url.toExternalForm() + "logtest").openStream(); + final ByteArrayOutputStream os = new ByteArrayOutputStream(); + + int bytesRead; + byte[] buffer = new byte[8192]; + while ((bytesRead = is.read(buffer)) > -1) { + os.write(buffer, 0, bytesRead); + } + + is.close(); + os.close(); + + final String output = new String(os.toByteArray(), "UTF-8"); + assertNotNull("Response shouldn't be null", output); + assertTrue("Output should contain: " + "It works!" + "\n" + output, output.contains("It works!")); + assertTrue("Output should contain: " + "Logger Factory: ch.qos.logback.classic.LoggerContext" + "\n" + output, output.contains("Logger Factory: ch.qos.logback.classic.LoggerContext")); + assertTrue("Output should contain: " + "logback-classic-1.2.11.jar" + "\n" + output, output.contains("logback-classic-1.2.11.jar")); + } +} diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java new file mode 100644 index 00000000000..465a0e52126 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java @@ -0,0 +1,94 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.openejb.arquillian.tests.slf4j; + +import org.apache.ziplock.WebModule; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.ResolutionException; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.InputStream; +import java.net.URL; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +@RunWith(Arquillian.class) +public class Slf4j2xLogbackWebappTest { + @ArquillianResource(SimpleServlet.class) + private URL url; + + @Deployment(testable = false) + public static WebArchive getArchive() { + File[] dependencies; + try { // try offline first since it is generally faster + dependencies = Maven.configureResolver() + .workOffline() + .loadPomFromFile("src/test/resources/slf4j2x-pom.xml") + .importCompileAndRuntimeDependencies().resolve().withTransitivity() + .asFile(); + } catch (ResolutionException re) { // try on central + dependencies = Maven.resolver() + .loadPomFromFile("src/test/resources/slf4j2x-pom.xml") + .importCompileAndRuntimeDependencies().resolve().withTransitivity() + .asFile(); + } + + + final WebArchive archive = new WebModule(BasicSlf4jWebappTest.class.getSimpleName()).getArchive(); + archive.addClass(SimpleServlet.class); + archive.add(new ClassLoaderAsset("org/apache/openejb/arquillian/tests/slf4j/logback.xml"), "WEB-INF/logback.xml"); + archive.addAsLibraries(dependencies); + System.out.println(archive.toString(true)); + return archive; + } + + @Test + public void validate() throws Exception { + final String launchProfile = System.getProperty("arquillian.launch"); + if ("tomee-embedded".equals(launchProfile)) { + System.out.println("Skipping this test in TomEE embedded"); + return; + } + + final InputStream is = new URL(url.toExternalForm() + "logtest").openStream(); + final ByteArrayOutputStream os = new ByteArrayOutputStream(); + + int bytesRead; + byte[] buffer = new byte[8192]; + while ((bytesRead = is.read(buffer)) > -1) { + os.write(buffer, 0, bytesRead); + } + + is.close(); + os.close(); + + final String output = new String(os.toByteArray(), "UTF-8"); + assertNotNull("Response shouldn't be null", output); + assertTrue("Output should contain: " + "It works!" + "\n" + output, output.contains("It works!")); + assertTrue("Output should contain: " + "Logger Factory: ch.qos.logback.classic.LoggerContext" + "\n" + output, output.contains("Logger Factory: ch.qos.logback.classic.LoggerContext")); + assertTrue("Output should contain: " + "logback-classic-1.4.11.jar" + "\n" + output, output.contains("logback-classic-1.4.11.jar")); + } +} diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/slf4j/logback.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/slf4j/logback.xml new file mode 100644 index 00000000000..f6698188243 --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/slf4j/logback.xml @@ -0,0 +1,37 @@ + + + + + ${catalina.base}/logs/tomcat.log + + + ${catalina.base}/logs/application.%i.log.zip + + 1 + 5 + + + 1MB + + + + + + + \ No newline at end of file diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j1x-pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j1x-pom.xml new file mode 100644 index 00000000000..99c264ab83a --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j1x-pom.xml @@ -0,0 +1,47 @@ + + + + 4.0.0 + org.apache.openejb.arquillian.tests + 1.0.0 + slf4j1x-logback-deps + + + 1.2.11 + 1.7.36 + + + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml new file mode 100644 index 00000000000..84bee8c7e8b --- /dev/null +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml @@ -0,0 +1,47 @@ + + + + 4.0.0 + org.apache.openejb.arquillian.tests + 1.0.0 + slf4j2x-logback-deps + + + 1.4.11 + 2.0.9 + + + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + From 55abd9997e7c9d52f8b29f18fa15d10261dc6c78 Mon Sep 17 00:00:00 2001 From: Jonathan Gallimore Date: Mon, 4 Dec 2023 11:52:55 +0000 Subject: [PATCH 4/5] Fix namespace --- .../openejb/arquillian/tests/slf4j/SimpleServlet.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java index 971b58032fc..7f33d7b1f42 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java @@ -16,11 +16,11 @@ */ package org.apache.openejb.arquillian.tests.slf4j; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.slf4j.ILoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 22aaaa024993c6572c2203ad0dccc1c7b95c6030 Mon Sep 17 00:00:00 2001 From: Jonathan Gallimore Date: Mon, 4 Dec 2023 15:16:27 +0000 Subject: [PATCH 5/5] Fix logback version for test --- .../arquillian/tests/slf4j/SimpleServlet.java | 22 +++++++++++-------- .../tests/slf4j/Slf4j2xLogbackWebappTest.java | 2 +- .../src/test/resources/slf4j2x-pom.xml | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java index 7f33d7b1f42..64f789a356d 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/SimpleServlet.java @@ -35,16 +35,20 @@ public class SimpleServlet extends HttpServlet { @Override protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException { - final ILoggerFactory iLoggerFactory = LoggerFactory.getILoggerFactory(); - final String loggerFactoryName = iLoggerFactory.getClass().getName(); + try { + final ILoggerFactory iLoggerFactory = LoggerFactory.getILoggerFactory(); + final String loggerFactoryName = iLoggerFactory.getClass().getName(); - LOGGER.info("Simple servlet called"); - LOGGER.info("Logger Factory: " + loggerFactoryName); + LOGGER.info("Simple servlet called"); + LOGGER.info("Logger Factory: " + loggerFactoryName); - final PrintWriter writer = resp.getWriter(); - writer.println("It works!\n" + - "Logger Factory: " + loggerFactoryName + "\n" + - "Protection Domain: " + iLoggerFactory.getClass().getProtectionDomain().toString()); - writer.flush(); + final PrintWriter writer = resp.getWriter(); + writer.println("It works!\n" + + "Logger Factory: " + loggerFactoryName + "\n" + + "Protection Domain: " + iLoggerFactory.getClass().getProtectionDomain().toString()); + writer.flush(); + } catch (Exception e) { + e.printStackTrace(); + } } } diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java index 465a0e52126..dd3ea40ff2e 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/Slf4j2xLogbackWebappTest.java @@ -89,6 +89,6 @@ public void validate() throws Exception { assertNotNull("Response shouldn't be null", output); assertTrue("Output should contain: " + "It works!" + "\n" + output, output.contains("It works!")); assertTrue("Output should contain: " + "Logger Factory: ch.qos.logback.classic.LoggerContext" + "\n" + output, output.contains("Logger Factory: ch.qos.logback.classic.LoggerContext")); - assertTrue("Output should contain: " + "logback-classic-1.4.11.jar" + "\n" + output, output.contains("logback-classic-1.4.11.jar")); + assertTrue("Output should contain: " + "logback-classic-1.3.14.jar" + "\n" + output, output.contains("logback-classic-1.3.14.jar")); } } diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml index 84bee8c7e8b..95a64519688 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/slf4j2x-pom.xml @@ -24,7 +24,7 @@ slf4j2x-logback-deps - 1.4.11 + 1.3.14 2.0.9