Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
# Conflicts:
#	spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
This commit is contained in:
Moritz Halbritter
2022-02-17 10:56:23 +01:00
parent e48b753b28 7c96294641
commit 42808ff13c
39 changed files with 394 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-system-tests/spring-boot-deployment-tests/src/main/resources/META-INF/spring-boot/org.springframework.boot.autoconfigure.AutoConfiguration
View File

@@ -0,0 +1 @@
sample.autoconfig.ExampleAutoConfiguration

2
spring-boot-system-tests/spring-boot-deployment-tests/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +0,0 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
sample.autoconfig.ExampleAutoConfiguration