Remove bean override

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

@@ -29,14 +29,6 @@ public class Application extends SpringBootServletInitializer {
 
   public static void main(String[] args) {
 
-  	 /*
-  	 * https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/246
-  	 * This will be allowed for a short period until we know how MDM should be configured
-  	 * or don't have multiple equal bean instantiations.
-  	 *
-  	 * This will require changes in the main project as stated in the Github comment
-  	 * */
-  	 System.setProperty("spring.main.allow-bean-definition-overriding","true");
 
     System.setProperty("spring.batch.job.enabled", "false");
     SpringApplication.run(Application.class, args);

src/main/resources/application.yaml

@@ -31,9 +31,6 @@ spring:
   batch:
     job:
       enabled: false
-  main:
-#    TODO 5.6.0 -> Prevent duplicate bean definitions in the Spring batch config in HAPI: see:
-    allow-bean-definition-overriding: true
 hapi:
   fhir:
     ### This is the FHIR version. Choose between, DSTU2, DSTU3, R4 or R5

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

@@ -21,7 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
      "spring.batch.job.enabled=false",
      "hapi.fhir.fhir_version=dstu2",
      "spring.datasource.url=jdbc:h2:mem:dbr2",
-	  "spring.main.allow-bean-definition-overriding=true"
   })
 public class ExampleServerDstu2IT {
 

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

@@ -46,7 +46,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
      "hapi.fhir.subscription.websocket_enabled=true",
      "hapi.fhir.allow_external_references=true",
      "hapi.fhir.allow_placeholder_references=true",
-	  "spring.main.allow-bean-definition-overriding=true"
   })
 
 

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

@@ -39,7 +39,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
      "hapi.fhir.fhir_version=r5",
      "hapi.fhir.subscription.websocket_enabled=true",
 	  "hapi.fhir.subscription.websocket_enabled=true",
-	  "spring.main.allow-bean-definition-overriding=true"
   })
 public class ExampleServerR5IT {
 

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

@@ -25,7 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
     "hapi.fhir.fhir_version=r4",
     "hapi.fhir.subscription.websocket_enabled=true",
     "hapi.fhir.partitioning.partitioning_include_in_search_hashes=false",
-	  "spring.main.allow-bean-definition-overriding=true"
 
   })
 public class MultitenantServerR4IT {