Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
This commit is contained in:
Sam Brannen
2022-09-14 16:52:55 +02:00
parent 992a81ab68 62a0ab3667
commit 8d92c57777
17 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/docs/asciidoc/testing.adoc
View File

@@ -1870,7 +1870,7 @@ Spring test configuration annotations are processed within enclosing class hiera
for inner test classes.
If `@NestedTestConfiguration` is not present or meta-present on a test class, in its
super type hierarchy, or in its enclosing class hierarchy, the default _enclosing
supertype hierarchy, or in its enclosing class hierarchy, the default _enclosing
configuration inheritance mode_ will be used. See the tip below for details on how to
change the default mode.