honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-20 19:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Grahame Grieve 2025-01-04 10:33:23 +11:00
commit 8232d93d81
9 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r4/src/test/resources/logback-test.xml
View File

@ -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">

2
org.hl7.fhir.r4b/src/test/resources/logback-test.xml
View File

@ -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">

2
org.hl7.fhir.r5/src/test/resources/logback-test.xml
View File

@ -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">

14
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/logging/ManagedLogging.java
View File

@ -31,20 +31,10 @@ package org.hl7.fhir.utilities.logging;
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 class ManagedLogging {
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 class ManagedLogging {
case IGNORED:
// nothing
break;
case LOG4J:
case SLF4J:
// todo
break;
default:

2
org.hl7.fhir.validation.cli/pom.xml
View File

@ -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>

3
org.hl7.fhir.validation.cli/src/main/resources/logback.xml
View File

@ -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>

3
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
View File

@ -204,6 +204,9 @@ public class ValidatorCli {
}
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);

4
org.hl7.fhir.validation/src/test/resources/logback-test.xml
View File

@ -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>

6
pom.xml
View File

@ -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.2.13</version>
<version>${logback.version}</version>
</dependency>
<dependency>