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");

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) {