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

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-core/src/test/java/org/springframework/core/annotation/TypeMappedAnnotationTests.java
#	spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
#	spring-test/src/test/java/org/springframework/test/util/MetaAnnotationUtilsTests.java
#	spring-test/src/test/java/org/springframework/test/util/OverriddenMetaAnnotationAttributesTests.java
This commit is contained in:
Sam Brannen
2022-07-09 16:24:04 +02:00
parent 73d92d66b9 d274e893a6
commit 2af08cf163
37 changed files with 114 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-tx/src/test/java/org/springframework/transaction/event/TransactionalEventListenerTests.java
View File

@@ -512,7 +512,7 @@ public class TransactionalEventListenerTests {
@Transactional
@Component
static interface TransactionalComponentTestListenerInterface {
interface TransactionalComponentTestListenerInterface {
// Cannot use #data in condition due to dynamic proxy.
@TransactionalEventListener(condition = "!'SKIP'.equals(#p0)")