Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
d08c84af
Commit
d08c84af
authored
Sep 29, 2016
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure that JtaAutoConfiguration runs before ArtemisAutoConfiguration
Closes gh-7062
parent
33ea7399
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
JtaAutoConfiguration.java
...t/autoconfigure/transaction/jta/JtaAutoConfiguration.java
+3
-2
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java
View file @
d08c84af
...
...
@@ -22,6 +22,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.boot.autoconfigure.jdbc.XADataSourceAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jms.artemis.ArtemisAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jms.hornetq.HornetQAutoConfiguration
;
import
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
...
...
@@ -38,8 +39,8 @@ import org.springframework.context.annotation.Import;
@ConditionalOnClass
(
javax
.
transaction
.
Transaction
.
class
)
@ConditionalOnProperty
(
prefix
=
"spring.jta"
,
value
=
"enabled"
,
matchIfMissing
=
true
)
@AutoConfigureBefore
({
XADataSourceAutoConfiguration
.
class
,
A
ctiveMQAutoConfiguration
.
class
,
Hornet
QAutoConfiguration
.
class
,
HibernateJpaAutoConfiguration
.
class
})
A
rtemisAutoConfiguration
.
class
,
ActiveM
QAutoConfiguration
.
class
,
H
ornetQAutoConfiguration
.
class
,
H
ibernateJpaAutoConfiguration
.
class
})
@Import
({
JndiJtaConfiguration
.
class
,
BitronixJtaConfiguration
.
class
,
AtomikosJtaConfiguration
.
class
,
NarayanaJtaConfiguration
.
class
})
@EnableConfigurationProperties
(
JtaProperties
.
class
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment