Merge remote-tracking branch 'origin/master'

HL7 · Jan 4, 2025 · c1badb9 · c1badb9
2 parents 6092913 + 7d570b1
commit c1badb9
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 16 deletions.
diff --git a/org.hl7.fhir.publisher.cli/pom.xml b/org.hl7.fhir.publisher.cli/pom.xml
@@ -12,8 +12,6 @@
 
     <artifactId>org.hl7.fhir.publisher.cli</artifactId>
 
-
-
     <dependencies>
         <dependency>
             <groupId>org.hl7.fhir.publisher</groupId>
@@ -124,6 +122,31 @@
                         </manifest>
                     </archive>
                 </configuration>
+                <executions>
+                    <!--
+                    Make an empty javadoc jar
+
+                    org.hl7.fhir.publisher.core contains all the necessary javadoc, and javadoc will attempt to make
+                    javadoc for all dependencies included in this jar.
+                    -->
+                    <execution>
+                        <id>empty-javadoc-jar</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>javadoc</classifier>
+                            <classesDirectory>${basedir}/javadoc</classesDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/org.hl7.fhir.publisher.cli/src/main/java/Placeholder.java b/org.hl7.fhir.publisher.cli/src/main/java/Placeholder.java
diff --git a/org.hl7.fhir.publisher.cli/src/main/resources/logback.xml b/org.hl7.fhir.publisher.cli/src/main/resources/logback.xml
@@ -1,5 +1,6 @@
-<configuration scan="true" scanPeriod="30 seconds">
-
+<configuration>
+	<!-- CLI logback config -->
+	<!-- TODO: this isn't being picked up in JAR creation. It should be overwriting the core config, but is not -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>INFO</level>
@@ -13,4 +14,6 @@
 		<appender-ref ref="STDOUT" />
 	</root>
 
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
 </configuration>
diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java
@@ -13920,8 +13920,12 @@ public static String buildReport(String ig, String source, String log, String qa
   public static void main(String[] args) throws Exception {
     int exitCode = 0;
 
+    // Prevents SLF4J(I) from printing unnecessary info to the console.
+    System.setProperty("slf4j.internal.verbosity", "WARN");
+
     org.hl7.fhir.utilities.FileFormat.checkCharsetAndWarnIfNotUTF8(System.out);
-    NpmPackage.setLoadCustomResources(true);  
+
+    NpmPackage.setLoadCustomResources(true);
     if (CliParams.hasNamedParam(args, FHIR_SETTINGS_PARAM)) {
       FhirSettings.setExplicitFilePath(CliParams.getNamedParam(args, FHIR_SETTINGS_PARAM));
     }

diff --git a/org.hl7.fhir.publisher.core/src/main/resources/log4j2.component.properties b/org.hl7.fhir.publisher.core/src/main/resources/log4j2.component.properties
@@ -0,0 +1,4 @@
+# This forces log4j2 to use the included simple logger. One of our dependencies is using log4j2 for logging
+# (no idea which one) instead of slf4j, and complains when log4j2 is unavailable. This prevents that complaint from
+# appearing.
+log4j2.loggerContextFactory = org.apache.logging.log4j.simple.SimpleLoggerContextFactory
diff --git a/org.hl7.fhir.publisher.core/src/main/resources/logback.xml b/org.hl7.fhir.publisher.core/src/main/resources/logback.xml
@@ -1,5 +1,5 @@
-<configuration scan="true" scanPeriod="30 seconds">
-
+<configuration>
+	<!-- Core logback config -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>INFO</level>
@@ -13,4 +13,6 @@
 		<appender-ref ref="STDOUT" />
 	</root>
 
+	<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
 </configuration>
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
         <maven.compiler.testRelease>11</maven.compiler.testRelease>
         <maven.compiler.testSource>11</maven.compiler.testSource>
         <maven.compiler.testTarget>11</maven.compiler.testTarget>
-        <logback-classic.version>1.2.13</logback-classic.version>
+        <logback-classic.version>1.5.15</logback-classic.version>
     </properties>
 
     <name>HL7 FHIR IG Publisher</name>