spring-framework/spring-context
Juergen Hoeller 585b4e08e8 Merge branch '6.2.x'
# Conflicts:
#	framework-platform/framework-platform.gradle
#	spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessor.java
#	spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java
2025-11-05 12:54:30 +01:00
..
src Merge branch '6.2.x' 2025-11-05 12:54:30 +01:00
.springBeans
spring-context.gradle Convert Spring @⁠Inject TCK tests from JUnit 3 to JUnit Jupiter 2025-06-28 19:29:49 +02:00