Merge branch '5.3.x'

spring-expression/readme.txt

@@ -31,10 +31,10 @@ Syntax
 - Need to agree on a standard date format for 'default' processing of dates.  Currently it is:
   formatter = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss z", Locale.UK);
   // this is something of this format: "Wed, 4 Jul 2001 12:08:56 GMT"
-  // https://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html
+  // https://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html
 - See LiteralTests for Date (4,5,6) - should date take an expression rather than be hardcoded in the grammar
   to take 2 strings only?
 - when doing arithmetic, eg. 8.4 / 4  and the user asks for an Integer return type - do we silently coerce or
   say we cannot as it won't fit into an int? (see OperatorTests.testMathOperatorDivide04)
 - Is $index within projection/selection useful or just cute?
-- All reals are represented as Doubles (so 1.25f is held internally as a double, can be converted to float when required though) - is that ok?
+- All reals are represented as Doubles (so 1.25f is held internally as a double, can be converted to float when required though) - is that ok?

spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurityExpressionTests.java

@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 ///CLOVER:OFF
 /**
- * Spring Security scenarios from https://wiki.springsource.com/display/SECURITY/Spring+Security+Expression-based+Authorization
+ * Spring Security scenarios from https://docs.spring.io/spring-security/reference/servlet/authorization/expression-based.html
  *
  * @author Andy Clement
  */