Merge pull request #11019 from freelansam/JAVA-5934

JAVA-5935: Analyse bean overriding fix in modules - Part 3

spring-boot-modules/spring-boot-mvc-2/src/main/resources/application.properties

@@ -1,4 +1,3 @@
-spring.main.allow-bean-definition-overriding=true
 spring.mvc.static-path-pattern=/content/**
 spring.webflux.static-path-pattern=/content/**
 spring.resources.static-locations=classpath:/files/,classpath:/static-files

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

@@ -1,2 +1 @@
-spring.main.allow-bean-definition-overriding=true
 spring.thymeleaf.view-names=thymeleaf/*

spring-boot-modules/spring-boot-runtime/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-runtime/src/test/resources/application.properties

@@ -8,5 +8,4 @@ endpoints.shutdown.enabled=true
 
 management.endpoint.restart.enabled=true
 
-spring.main.allow-bean-definition-overriding=true
 spring.jmx.unique-names=true

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

@@ -6,4 +6,3 @@ spring.redis.port= 6379
 spring.security.user.name=john
 spring.security.user.password=123
 
-spring.main.allow-bean-definition-overriding=true