Merge branch '5.3.x'

# Conflicts: # spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java
2022-07-13 14:06:53 +02:00
parent ddd11610cf 46db372951
commit 89f66ccf6a
55 changed files with 98 additions and 95 deletions
--- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/TestExceptionResolver.java
@@ -24,7 +24,7 @@ import org.springframework.core.MethodIntrospector;
 import org.springframework.util.ReflectionUtils;

 /**
- * Sub-class for {@link AbstractExceptionHandlerMethodResolver} for testing.
+ * Subclass for {@link AbstractExceptionHandlerMethodResolver} for testing.
 * @author Rossen Stoyanchev
 */
 public class TestExceptionResolver extends AbstractExceptionHandlerMethodResolver {