Merge branch '5.3.x'

# Conflicts: # spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
2022-09-14 16:52:55 +02:00
parent 992a81ab68 62a0ab3667
commit 8d92c57777
17 changed files with 22 additions and 22 deletions
--- a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
@@ -19,7 +19,7 @@ package org.springframework.expression;
 import org.springframework.lang.Nullable;

 /**
- * Super class for exceptions that can occur whilst processing expressions.
+ * Superclass for exceptions that can occur whilst processing expressions.
 *
 * @author Andy Clement
 * @author Phillip Webb