Skip to content

Commit b00d5fa

Browse files
committed
Auto-configure Hibernate JPA before DataSource TransactionManager
Fixes gh-38861
1 parent 513448e commit b00d5fa

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
2323
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
26+
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
2627
import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
2728
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2829
import org.springframework.context.annotation.Import;
@@ -37,7 +38,8 @@
3738
* @author Andy Wilkinson
3839
* @since 1.0.0
3940
*/
40-
@AutoConfiguration(after = DataSourceAutoConfiguration.class, before = TransactionAutoConfiguration.class)
41+
@AutoConfiguration(after = DataSourceAutoConfiguration.class,
42+
before = { TransactionAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class })
4143
@ConditionalOnClass({ LocalContainerEntityManagerFactoryBean.class, EntityManager.class, SessionImplementor.class })
4244
@EnableConfigurationProperties(JpaProperties.class)
4345
@Import(HibernateJpaConfiguration.class)

0 commit comments

Comments
 (0)