Merge branch 'master' into do-20240510-qa-enabled-exec-pipeline

SECURITY.md

@@ -1,5 +1,9 @@
 # Security Policy
 
+## Supported Versions
+
+Only new releases of this project will contain security updates. All clients should use the latest version of this project in their dependencies. There is no process in place to backport security fixes to previous releases. If you require a backport, please [create an issue](../../issues/new/choose) containing an explanation of why the latest version cannot be used.
+
 ## Reporting a Vulnerability
 
 Please report all potential security vulnerabilities using the [Report a vulnerability](../../security/advisories/new) button in the [Security](../../security) section of this repository. 

org.hl7.fhir.publisher.cli/pom.xml

@@ -5,15 +5,13 @@
     <parent>
         <artifactId>org.hl7.fhir.publisher</artifactId>
         <groupId>org.hl7.fhir.publisher</groupId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <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>

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>

org.hl7.fhir.publisher.core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hl7.fhir.publisher</groupId>
         <artifactId>org.hl7.fhir.publisher</artifactId>
-        <version>1.8.5-SNAPSHOT</version>
+        <version>1.8.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>