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
This commit is contained in:
Juergen Hoeller
2025-11-05 12:54:30 +01:00
6 changed files with 76 additions and 61 deletions
@@ -19,15 +19,17 @@ package org.springframework.transaction.annotation;
import org.springframework.transaction.TransactionManager;
/**
* Interface to be implemented by @{@link org.springframework.context.annotation.Configuration
* Configuration} classes annotated with @{@link EnableTransactionManagement} that wish to
* (or need to) explicitly specify the default {@code PlatformTransactionManager} bean
* (or {@code ReactiveTransactionManager} bean) to be used for annotation-driven
* transaction management, as opposed to the default approach of a by-type lookup.
* One reason this might be necessary is if there are two {@code PlatformTransactionManager}
* beans (or two {@code ReactiveTransactionManager} beans) present in the container.
* Interface to be implemented for explicitly specifying the default
* {@link org.springframework.transaction.PlatformTransactionManager} bean
* (or {@link org.springframework.transaction.ReactiveTransactionManager} bean)
* to be used for annotation-driven transaction management, as opposed to the
* default approach of a by-type lookup. One reason this might be necessary is
* if there are two {@code PlatformTransactionManager} beans (or two
* {@code ReactiveTransactionManager} beans) present in the container.
*
* <p>See @{@link EnableTransactionManagement} for general examples and context;
* <p>Typically implemented by @{@link org.springframework.context.annotation.Configuration
* Configuration} classes annotated with @{@link EnableTransactionManagement}.
* See @{@link EnableTransactionManagement} for general examples and context;
* see {@link #annotationDrivenTransactionManager()} for detailed instructions.
*
* <p><b>NOTE: A {@code TransactionManagementConfigurer} will get initialized early.</b>