admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
618bce3bd8e72d7d2d478fda2b04e399d2a3dbf5
spring-projects-spring-fram…/spring-aop
T
History
Juergen Hoeller b261b74793 Merge branch '6.2.x' 
# Conflicts:
#	spring-aop/src/main/java/org/springframework/aop/framework/CoroutinesUtils.java
#	spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java
#	spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
#	spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java
2025-10-18 15:32:19 +02:00
..
src
Merge branch '6.2.x'
2025-10-18 15:32:19 +02:00
spring-aop.gradle
Refine jsr305 dependency management
2024-12-26 14:13:17 +01:00