Merge branch '3.4.x'

Closes gh-44820
This commit is contained in:
Stéphane Nicoll 2025-03-21 07:53:37 +01:00
commit 515ce3d44d
1 changed files with 1 additions and 1 deletions

View File

@ -47,7 +47,7 @@ import org.springframework.transaction.TransactionManager;
* @since 1.0.0 * @since 1.0.0
*/ */
@AutoConfiguration(before = TransactionAutoConfiguration.class, @AutoConfiguration(before = TransactionAutoConfiguration.class,
after = TransactionManagerCustomizationAutoConfiguration.class) after = { DataSourceAutoConfiguration.class, TransactionManagerCustomizationAutoConfiguration.class })
@ConditionalOnClass({ DataSource.class, JdbcTemplate.class, TransactionManager.class }) @ConditionalOnClass({ DataSource.class, JdbcTemplate.class, TransactionManager.class })
@AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE) @AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
public class DataSourceTransactionManagerAutoConfiguration { public class DataSourceTransactionManagerAutoConfiguration {