90e0bd146a
# Conflicts: # spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java # spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java # spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java # spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java