First commit to restore hapi-fhir 6.3.6-SNAPSHOT changes. Add static code blocks to Application.java as well as all tests to System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-        <version>6.2.2</version>
+        <version>6.3.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
@@ -44,12 +44,12 @@
     <dependencies>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-api</artifactId>
+            <artifactId>websocket-jetty-api</artifactId>
             <version>${jetty_version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-client</artifactId>
+            <artifactId>websocket-jetty-client</artifactId>
             <version>${jetty_version}</version>
         </dependency>
         <dependency>
@@ -246,7 +246,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-server</artifactId>
+            <artifactId>websocket-jetty-server</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/ca/uhn/fhir/jpa/starter/Application.java

@@ -38,6 +38,10 @@ import org.springframework.web.servlet.DispatcherServlet;
 })
 public class Application extends SpringBootServletInitializer {
 
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
+
   public static void main(String[] args) {
 
     SpringApplication.run(Application.class, args);

src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigDstu2.java

@@ -2,7 +2,6 @@ package ca.uhn.fhir.jpa.starter.common;
 
 import ca.uhn.fhir.jpa.config.JpaDstu2Config;
 import ca.uhn.fhir.jpa.starter.annotations.OnDSTU2Condition;
-import ca.uhn.fhir.jpa.term.TermCodeSystemStorageSvcImpl;
 import ca.uhn.fhir.jpa.term.TermLoaderSvcImpl;
 import ca.uhn.fhir.jpa.term.api.ITermCodeSystemStorageSvc;
 import ca.uhn.fhir.jpa.term.api.ITermDeferredStorageSvc;
@@ -24,9 +23,4 @@ public class FhirServerConfigDstu2 {
 		return new TermLoaderSvcImpl(theDeferredStorageSvc, theCodeSystemStorageSvc);
 	}
 
-	@Bean
-	public ITermCodeSystemStorageSvc termCodeSystemStorageSvc() {
-		return new TermCodeSystemStorageSvcImpl();
-	}
-
 }

src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java

@@ -206,16 +206,6 @@ public class StarterJpaConfig {
 		return packageInstallerSvc;
 	}
 
-	@Bean
-	@Primary
-	/*
-		This bean is currently necessary to override from MDM settings
-	 */
-	IMdmLinkDao mdmLinkDao() {
-		return new MdmLinkDaoJpaImpl();
-	}
-
-
 	@Bean
 	@Conditional(OnCorsPresent.class)
 	public CorsInterceptor corsInterceptor(AppProperties appProperties) {

src/test/java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java

@@ -13,6 +13,10 @@ import org.springframework.boot.test.context.SpringBootTest;
 })
 public class CustomBeanTest {
 
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
+
 	@Autowired
 	some.custom.pkg1.CustomBean customBean1;
 

src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java

@@ -23,6 +23,10 @@ import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum;
 
 public class CustomInterceptorTest {
 
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
+
 	@LocalServerPort
 	private int port;
 

src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java

@@ -57,8 +57,12 @@ import org.testcontainers.elasticsearch.ElasticsearchContainer;
   })
 @ContextConfiguration(initializers = ElasticsearchLastNR4IT.Initializer.class)
 public class ElasticsearchLastNR4IT {
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
 
-  private IGenericClient ourClient;
+
+	private IGenericClient ourClient;
   private FhirContext ourCtx;
 
   private static final String ELASTIC_VERSION = "7.16.3";

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java

@@ -23,6 +23,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
   })
 public class ExampleServerDstu2IT {
 
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
+
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class);
 	private IGenericClient ourClient;
 	private FhirContext ourCtx;

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java

@@ -51,6 +51,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ExampleServerDstu3IT implements IServerSupport {
 
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
+
   private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class);
   private IGenericClient ourClient;
   private FhirContext ourCtx;

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java

@@ -20,13 +20,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 	"hapi.fhir.fhir_version=r4b",
 	"hapi.fhir.subscription.websocket_enabled=false",
 	"hapi.fhir.mdm_enabled=false",
-	"hapi.fhir.implementationguides.dk-core.name=hl7.fhir.dk.core",
-	"hapi.fhir.implementationguides.dk-core.version=1.1.0",
 	// Override is currently required when using MDM as the construction of the MDM
 	// beans are ambiguous as they are constructed multiple places. This is evident
 	// when running in a spring boot environment
 	"spring.main.allow-bean-definition-overriding=true"})
 class ExampleServerR4BIT {
+
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerR4BIT.class);
 	private IGenericClient ourClient;
 	private FhirContext ourCtx;

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java

@@ -43,6 +43,11 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 		// when running in a spring boot environment
 		"spring.main.allow-bean-definition-overriding=true" })
 class ExampleServerR4IT {
+
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
+
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerR4IT.class);
 	private IGenericClient ourClient;
 	private FhirContext ourCtx;

src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java

@@ -41,7 +41,11 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
   })
 public class ExampleServerR5IT {
 
-  private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class);
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
+
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class);
   private IGenericClient ourClient;
   private FhirContext ourCtx;
 

src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java

@@ -28,6 +28,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
   })
 public class MultitenantServerR4IT {
 
+	static {
+		System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
+	}
 
   private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class);
   private IGenericClient ourClient;