Merge branch '5.1.x'

2019-06-12 18:16:30 +02:00
parent 49873a30c5 fc46abf0b7
commit 0a77477d32
19 changed files with 31 additions and 31 deletions
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
@@ -56,7 +56,7 @@ import org.springframework.transaction.TransactionDefinition;
 * @see org.springframework.transaction.interceptor.DefaultTransactionAttribute
 * @see org.springframework.transaction.interceptor.RuleBasedTransactionAttribute
 */
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented