Fix logback configs + update logback (#1868)

* .qos.logback-logback-core-1.5.13: Fix inclusion of logback-test in jar and fix classpath log configs * Fix LoggingPolicy enum (use SLF4J)
hapifhir · Jan 3, 2025 · 9cc31c5 · 9cc31c5
1 parent 251c29c
commit 9cc31c5
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 23 deletions.
diff --git a/org.hl7.fhir.r4/src/test/resources/logback-test.xml b/org.hl7.fhir.r4/src/test/resources/logback-test.xml
@@ -1,4 +1,4 @@
-<configuration scan="true" scanPeriod="30 seconds">
+<configuration>
 
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">

diff --git a/org.hl7.fhir.r4b/src/test/resources/logback-test.xml b/org.hl7.fhir.r4b/src/test/resources/logback-test.xml
@@ -1,4 +1,4 @@
-<configuration scan="true" scanPeriod="30 seconds">
+<configuration>
 
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">

diff --git a/org.hl7.fhir.r5/src/test/resources/logback-test.xml b/org.hl7.fhir.r5/src/test/resources/logback-test.xml
@@ -1,4 +1,4 @@
-<configuration scan="true" scanPeriod="30 seconds">
+<configuration>
 
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/logging/ManagedLogging.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/logging/ManagedLogging.java
@@ -31,20 +31,10 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 
 
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
 
 import javax.annotation.Nonnull;
 
-import org.hl7.fhir.utilities.Utilities;
-
 /**
  * see security.md - manages logging by the FHIR HAPI Core library
  *  
@@ -60,7 +50,7 @@ public interface ILoggingProvider {
   public enum LoggingPolicy {
     CONSOLE, // log messages go to System.out (default)
     IGNORED, // log messages don't go anywhere
-    LOG4J, // log messages go to Log4J
+    SLF4J, // log messages go to SLF4J
     CUSTOM, // log messages to an ILoggingProvider implementation
   }
 
@@ -98,7 +88,7 @@ public static void log(String message) throws IOException {
     case IGNORED:
       // nothing
       break;
-    case LOG4J:
+    case SLF4J:
       // todo
       break;
     default:

diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml
@@ -304,7 +304,7 @@
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <excludes>**/module-info.class,META-INF/*</excludes>
+                            <excludes>**/module-info.class,META-INF/*,logback-test.xml</excludes>
                             <outputDirectory>${project.build.directory}/classes</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>

diff --git a/org.hl7.fhir.validation.cli/src/main/resources/logback.xml b/org.hl7.fhir.validation.cli/src/main/resources/logback.xml
@@ -1,5 +1,4 @@
-<configuration scan="true" scanPeriod="30 seconds">
-
+<configuration>
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>INFO</level>

diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
@@ -204,6 +204,9 @@ private void displayHelpForTask(CliTask cliTask) {
   }
 
   public static void main(String[] args) throws Exception {
+    // Prevents SLF4J(I) from printing unnecessary info to the console.
+    System.setProperty("slf4j.internal.verbosity", "WARN");
+
     final ValidatorCli validatorCli = new ValidatorCli(validationService);
 
     args = addAdditionalParamsForIpsParam(args);

diff --git a/org.hl7.fhir.validation/src/test/resources/logback-test.xml b/org.hl7.fhir.validation/src/test/resources/logback-test.xml
@@ -1,5 +1,4 @@
-<configuration scan="true" scanPeriod="30 seconds">
-
+<configuration>
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>INFO</level>
@@ -12,5 +11,4 @@
 	<root level="info">
 		<appender-ref ref="STDOUT" />
 	</root>
-
 </configuration>
diff --git a/pom.xml b/pom.xml
@@ -43,6 +43,8 @@
         <maven.compiler.testTarget>11</maven.compiler.testTarget>
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
         <checkstyle_config_location>${project.basedir}</checkstyle_config_location>
+        <logback-classic.version>1.5.15</logback-classic.version>
+        <logback.version>1.5.15</logback.version>
     </properties>
 
     <name>HL7 Core Artifacts</name>
@@ -313,13 +315,13 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.2.13</version>
+                <version>${logback-classic.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-                <version>1.5.13</version>
+                <version>${logback.version}</version>
             </dependency>
 
             <dependency>