Sam Brannen 49b47cc6cf Merge branch '5.3.x' ...

# Conflicts:
#	spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java

2022-07-12 12:42:49 +02:00

..

main

Merge branch '5.3.x'

2022-07-12 12:42:49 +02:00

test

Merge branch '5.3.x'

2022-07-12 12:42:49 +02:00

testFixtures/java/org/springframework/transaction/testfixture

Rollback reactive transaction on cancel

2020-06-17 15:04:54 +02:00