diff --git a/pom.xml b/pom.xml
index d56db5c..bfa4419 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,8 @@
11
+ 1.2.11
+ 1.7.25
@@ -357,6 +359,23 @@
test
+
+ org.slf4j
+ slf4j-api
+ ${slf4j-api.version}
+
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback-classic.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback-classic.version}
+
+
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
index 71ada0b..8031c59 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
@@ -38,10 +38,6 @@ 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);
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java
index 842798c..af9db0d 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/CustomBeanTest.java
@@ -13,10 +13,6 @@ 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;
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java b/src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java
index 9939210..377719e 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/CustomInterceptorTest.java
@@ -23,10 +23,6 @@ import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum;
public class CustomInterceptorTest {
- static {
- System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
- }
-
@LocalServerPort
private int port;
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java
index 0aea7f8..064c240 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ElasticsearchLastNR4IT.java
@@ -57,10 +57,6 @@ 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 FhirContext ourCtx;
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java
index 1c5a565..e20aff8 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu2IT.java
@@ -23,10 +23,6 @@ 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;
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
index d7745bd..826f311 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerDstu3IT.java
@@ -51,10 +51,6 @@ 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;
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java
index 2157c28..fc7bf58 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4BIT.java
@@ -25,10 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
// 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;
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
index 44808ad..278a5f0 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
@@ -43,11 +43,6 @@ 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;
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
index f8e807e..ddbd6a7 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR5IT.java
@@ -41,11 +41,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
})
public class ExampleServerR5IT {
- static {
- System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");
- }
-
- private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class);
+ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerDstu2IT.class);
private IGenericClient ourClient;
private FhirContext ourCtx;
diff --git a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java
index a5c2da5..9d340b1 100644
--- a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java
@@ -28,9 +28,6 @@ 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;