From 435d1e2ac047df95f4bc3155b9f870cefc0b3312 Mon Sep 17 00:00:00 2001
From: dotasek <dotasek.dev@gmail.com>
Date: Thu, 2 Jan 2025 12:25:46 -0500
Subject: [PATCH 1/2] Bump core to 6.5.3-SNAPSHOT (#1013)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aee29774f..5593ba3f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <core_version>6.5.2</core_version>
+        <core_version>6.5.3-SNAPSHOT</core_version>
         <maven_surefire_version>3.0.0-M5</maven_surefire_version>
         <apache_poi_version>5.2.1</apache_poi_version>
         <lombok_version>1.18.32</lombok_version>

From 7d570b115197f54d0ed2de7bcb3e36a9368afb18 Mon Sep 17 00:00:00 2001
From: dotasek <dotasek.dev@gmail.com>
Date: Fri, 3 Jan 2025 13:10:33 -0500
Subject: [PATCH 2/2] Bump logback to 1.5.15 (#1014)

* Bump logback to 1.5.15

* Bump version again

* Fix logback config, stop building JavaDoc for whole jar.

* Remove unneeded Placeholder, fix ERROR for missing log4j2 impl

* Comments
---
 org.hl7.fhir.publisher.cli/pom.xml            | 27 +++++++++++++++++--
 .../src/main/java/Placeholder.java            |  8 ------
 .../src/main/resources/logback.xml            |  7 +++--
 .../hl7/fhir/igtools/publisher/Publisher.java |  6 ++++-
 .../resources/log4j2.component.properties     |  4 +++
 .../src/main/resources/logback.xml            |  6 +++--
 pom.xml                                       |  2 +-
 7 files changed, 44 insertions(+), 16 deletions(-)
 delete mode 100644 org.hl7.fhir.publisher.cli/src/main/java/Placeholder.java
 create mode 100644 org.hl7.fhir.publisher.core/src/main/resources/log4j2.component.properties

diff --git a/org.hl7.fhir.publisher.cli/pom.xml b/org.hl7.fhir.publisher.cli/pom.xml
index f53b76ecc..cfe87e69d 100644
--- 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
deleted file mode 100644
index a29de2bc1..000000000
--- a/org.hl7.fhir.publisher.cli/src/main/java/Placeholder.java
+++ /dev/null
@@ -1,8 +0,0 @@
-import org.hl7.fhir.utilities.Utilities;
-
-/**
- * This class is just a placeholder to force the source JAR and javadoc JAR
- * to be created so that Maven Central doesn't complain.
- */
-public class Placeholder {
-}
diff --git a/org.hl7.fhir.publisher.cli/src/main/resources/logback.xml b/org.hl7.fhir.publisher.cli/src/main/resources/logback.xml
index 1c8de9da3..83e50b7fe 100644
--- 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>
\ No newline at end of file
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
index b87fb9efb..b95390ee9 100644
--- 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
@@ -13905,8 +13905,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
new file mode 100644
index 000000000..51eb50a73
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/org.hl7.fhir.publisher.core/src/main/resources/logback.xml b/org.hl7.fhir.publisher.core/src/main/resources/logback.xml
index 1c8de9da3..0c5bc3c28 100644
--- 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>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5593ba3f3..53f638513 100644
--- 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>