Merge pull request #10963 from freelansam/JAVA-5934

JAVA-5934: Analyse bean overriding fix in modules - Part 2

spring-boot-modules/spring-boot-artifacts/src/main/resources/application.properties

@@ -1 +0,0 @@
-spring.main.allow-bean-definition-overriding=true

spring-boot-modules/spring-boot-data/src/main/resources/application.properties

@@ -6,7 +6,6 @@ spring.datasource.url=jdbc:h2:mem:testdb
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
-spring.main.allow-bean-definition-overriding=true
 javers.mappingStyle=FIELD
 javers.algorithm=SIMPLE
 javers.commitIdGenerator=synchronized_sequence

spring-boot-modules/spring-boot-deployment/src/main/resources/application.properties

@@ -3,5 +3,4 @@ management.metrics.enable.root=true
 management.metrics.enable.jvm=true
 management.endpoint.restart.enabled=true
 spring.datasource.jmx-enabled=false
-spring.main.allow-bean-definition-overriding=true
 management.endpoint.shutdown.enabled=true

spring-boot-modules/spring-boot-environment/src/main/resources/application.properties

@@ -3,6 +3,5 @@ management.metrics.enable.root=true
 management.metrics.enable.jvm=true
 management.endpoint.restart.enabled=true
 spring.datasource.tomcat.jmx-enabled=false
-spring.main.allow-bean-definition-overriding=true
 management.endpoint.shutdown.enabled=true
 spring.config.import=file:./additional.properties,optional:file:/Users/home/config/jdbc.properties