diff --git a/clients/deltalake/core/src/test/resources/logback-test.xml b/clients/deltalake/core/src/test/resources/logback-test.xml new file mode 100644 index 00000000000..2a6be300dc2 --- /dev/null +++ b/clients/deltalake/core/src/test/resources/logback-test.xml @@ -0,0 +1,30 @@ + + + + + + + %date{ISO8601} [%thread] %-5level %logger{36} - %msg%n + + + + + + + diff --git a/clients/deltalake/spark2/src/test/resources/logback-test.xml b/clients/deltalake/spark2/src/test/resources/logback-test.xml index 2dfa111f900..c1f87f9456d 100644 --- a/clients/deltalake/spark2/src/test/resources/logback-test.xml +++ b/clients/deltalake/spark2/src/test/resources/logback-test.xml @@ -23,9 +23,9 @@ %date{ISO8601} [%thread] %-5level %logger{36} - %msg%n - + - + diff --git a/clients/deltalake/spark3/src/test/resources/logback-test.xml b/clients/deltalake/spark3/src/test/resources/logback-test.xml index 2dfa111f900..c1f87f9456d 100644 --- a/clients/deltalake/spark3/src/test/resources/logback-test.xml +++ b/clients/deltalake/spark3/src/test/resources/logback-test.xml @@ -23,9 +23,9 @@ %date{ISO8601} [%thread] %-5level %logger{36} - %msg%n - + - + diff --git a/clients/hmsbridge/core/src/test/resources/log4j2-test.xml b/clients/hmsbridge/core/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..04a8ddf06c2 --- /dev/null +++ b/clients/hmsbridge/core/src/test/resources/log4j2-test.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + diff --git a/clients/hmsbridge/core/src/test/resources/logback-test.xml b/clients/hmsbridge/core/src/test/resources/logback-test.xml new file mode 100644 index 00000000000..2a6be300dc2 --- /dev/null +++ b/clients/hmsbridge/core/src/test/resources/logback-test.xml @@ -0,0 +1,30 @@ + + + + + + + %date{ISO8601} [%thread] %-5level %logger{36} - %msg%n + + + + + + + diff --git a/servers/quarkus-server/pom.xml b/servers/quarkus-server/pom.xml index b375a3f9e2d..4dc8a2e4af1 100644 --- a/servers/quarkus-server/pom.xml +++ b/servers/quarkus-server/pom.xml @@ -31,6 +31,7 @@ ${project.build.directory}/openapi + INFO @@ -188,6 +189,9 @@ ${maven.home} + org.jboss.logmanager.LogManager + ${test.log.level} + ${test.log.level} diff --git a/tools/apprunner-maven-plugin/src/main/java/org/projectnessie/quarkus/maven/QuarkusAppStartMojo.java b/tools/apprunner-maven-plugin/src/main/java/org/projectnessie/quarkus/maven/QuarkusAppStartMojo.java index 3b62bb00404..38a587d979c 100644 --- a/tools/apprunner-maven-plugin/src/main/java/org/projectnessie/quarkus/maven/QuarkusAppStartMojo.java +++ b/tools/apprunner-maven-plugin/src/main/java/org/projectnessie/quarkus/maven/QuarkusAppStartMojo.java @@ -22,6 +22,7 @@ import java.net.URLClassLoader; import java.util.Map; import java.util.Properties; +import java.util.logging.LogManager; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; @@ -107,6 +108,9 @@ public class QuarkusAppStartMojo extends AbstractQuarkusAppMojo { @Parameter private Properties outputProperties; + @Parameter(defaultValue = "true") + private boolean resetJavaUtilLogging; + @Override public void execute() throws MojoExecutionException, MojoFailureException { if (isSkipped()) { @@ -139,6 +143,13 @@ public void execute() throws MojoExecutionException, MojoFailureException { // Use MavenProject classloader as parent classloader as Maven classloader hierarchy is not linear final URLClassLoader mirrorCL = new URLClassLoader(urls, MavenProject.class.getClassLoader()); + String oldLogManager = System.getProperty("java.util.logging.manager"); + if (resetJavaUtilLogging) { + // Quarkus uses the JBoss LogManager, have to set it + System.setProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager"); + LogManager.getLogManager().reset(); + } + final AutoCloseable quarkusApp; try { Class clazz = mirrorCL.loadClass(QuarkusApp.class.getName()); @@ -173,6 +184,16 @@ public void execute() throws MojoExecutionException, MojoFailureException { quarkusApp.close(); } finally { mirrorCL.close(); + + if (resetJavaUtilLogging) { + // Quarkus uses the JBoss LogManager, have to set it + if (oldLogManager == null) { + System.getProperties().remove("java.util.logging.manager"); + } else { + System.setProperty("java.util.logging.manager", oldLogManager); + } + LogManager.getLogManager().reset(); + } } }); } diff --git a/versioned/jgit/src/test/resources/logback-test.xml b/versioned/jgit/src/test/resources/logback-test.xml index a02487bb903..2a6be300dc2 100644 --- a/versioned/jgit/src/test/resources/logback-test.xml +++ b/versioned/jgit/src/test/resources/logback-test.xml @@ -24,7 +24,7 @@ - + diff --git a/versioned/tiered/dynamodb/src/test/resources/logback-test.xml b/versioned/tiered/dynamodb/src/test/resources/logback-test.xml index a02487bb903..2a6be300dc2 100644 --- a/versioned/tiered/dynamodb/src/test/resources/logback-test.xml +++ b/versioned/tiered/dynamodb/src/test/resources/logback-test.xml @@ -24,7 +24,7 @@ - + diff --git a/versioned/tiered/gc/src/test/resources/logback-test.xml b/versioned/tiered/gc/src/test/resources/logback-test.xml new file mode 100644 index 00000000000..2a6be300dc2 --- /dev/null +++ b/versioned/tiered/gc/src/test/resources/logback-test.xml @@ -0,0 +1,30 @@ + + + + + + + %date{ISO8601} [%thread] %-5level %logger{36} - %msg%n + + + + + + + diff --git a/versioned/tiered/mongodb/src/test/resources/logback-test.xml b/versioned/tiered/mongodb/src/test/resources/logback-test.xml new file mode 100644 index 00000000000..2a6be300dc2 --- /dev/null +++ b/versioned/tiered/mongodb/src/test/resources/logback-test.xml @@ -0,0 +1,30 @@ + + + + + + + %date{ISO8601} [%thread] %-5level %logger{36} - %msg%n + + + + + + +