821f7086d9
Merge branch '2.6.x' into 2.7.x
...
See gh-28985
2021-12-18 17:53:59 +01:00
e048562c34
Merge branch '2.5.x' into 2.6.x
...
See gh-28984
2021-12-18 17:53:39 +01:00
21e54a595e
Upgrade Build to Log4j 2.17.0
...
See gh-28983
2021-12-18 17:53:30 +01:00
4fa0e87ba1
Merge branch '2.6.x' into 2.7.x
2021-12-18 12:24:51 +01:00
efa93506e6
Fix checkstyle violations
2021-12-18 12:23:53 +01:00
ed80241a80
Merge branch '2.6.x' into 2.7.x
2021-12-18 09:08:51 +01:00
272e08ad1a
Merge branch '2.5.x' into 2.6.x
2021-12-18 09:08:44 +01:00
84ef1f7c21
Upgrade to Log4j2 2.17.0
...
Closes gh-28985
2021-12-18 08:53:36 +01:00
012fbdd43d
Upgrade to Log4j2 2.17.0
...
Closes gh-28984
2021-12-18 08:53:04 +01:00
cb02944c71
Upgrade to Log4j2 2.17.0
...
Closes gh-28983
2021-12-18 08:52:22 +01:00
d803c53e02
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29109
2021-12-17 17:57:33 -08:00
4cc8012bfa
Handle WebServerNamespace in CachingOperationInvoker
...
Fixes gh-28882
2021-12-17 17:55:06 -08:00
764531c326
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29108
2021-12-17 17:51:29 -08:00
d9d161cd6b
Allow previously authorized users to access the error page
...
Prior to this commit, the `ErrorPageSecurityFilter` verified if
access to the error page was allowed by invoking the
`WebInvocationPrivilegeEvaluator` with the Authentication from the
`SecurityContextHolder`.
This meant that access to the error page was denied for a `null` Authentication
or `AnonymousAuthenticationToken` in cases where the error page required
authenticated access. This prevented authorized users from accessing the
error page in case the Authentication wasn't retrievable for the error dispatch,
which is the case for `@Transient` authentication or stateless session policy.
This commit updates the `ErrorPageSecurityFilter` to check access to the error page
only if the error is an authn or authz error in cases where an authentication object
is not found in the SecurityContextHolder. This makes the error response consistent
when bad credentials or no credentials are used while also allowing access to previously
authorized users.
Fixes gh-28953
2021-12-17 16:58:58 -08:00
64dd1f86c0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29104
2021-12-17 16:38:07 +01:00
c077ebecf7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29103
2021-12-17 16:37:53 +01:00
2fec06ac7e
Find annotation without initializing factory beans
...
Closes gh-28977
2021-12-17 16:08:30 +01:00
b04f7904ff
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29013
2021-12-17 12:15:15 +01:00
1c35ec2c3c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29012
2021-12-17 12:14:31 +01:00
5d0206320a
Upgrade to Logback 1.2.9
...
Closes gh-29011
2021-12-17 12:13:02 +01:00
de383fcee0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29099
2021-12-17 10:50:15 +01:00
bcaa59ce73
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29098
2021-12-17 10:50:07 +01:00
614d34195a
Merge pull request #29094 from An1s9n
...
* pr/29094:
Polish CacheManager customization section in reference doc
Closes gh-29094
2021-12-17 10:50:00 +01:00
415c58e21b
Polish CacheManager customization section in reference doc
...
See gh-29094
2021-12-17 10:48:55 +01:00
a05714ad9f
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29097
2021-12-17 10:30:42 +01:00
10362a9315
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29096
2021-12-17 10:30:26 +01:00
8c9d398422
Test our Gradle plugin against Gradle 7.3.2
...
Closes gh-29093
2021-12-17 09:11:44 +01:00
1015df088d
Merge branch '2.6.x' into 2.7.x
2021-12-16 13:55:55 -08:00
587d6fa309
Polish
2021-12-16 13:55:42 -08:00
9c36682fe7
Merge branch '2.6.x' into 2.7.x
2021-12-16 13:49:44 -08:00
f676602c96
Merge branch '2.5.x' into 2.6.x
2021-12-16 13:49:12 -08:00
783981ba98
Merge branch '2.4.x' into 2.5.x
2021-12-16 13:48:25 -08:00
d336a96b7f
Update web.xml xsd references to for 3.1 version
...
See gh-29075
2021-12-16 13:45:12 -08:00
a74b563b49
Merge branch '2.6.x' into 2.7.x
2021-12-16 13:06:20 -08:00
a6a5b81dd0
Merge branch '2.5.x' into 2.6.x
2021-12-16 13:05:44 -08:00
f3bcbca841
Update copyright year of changed files
2021-12-16 13:05:17 -08:00
4cad4851da
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29088
2021-12-16 12:24:12 -06:00
92b096abbf
Fix message interpolation when code is used as default message
...
When `setUseCodeAsDefaultMessage(true)` was set on a message source,
attempting to interpolate the default message returned from the message
source would result in the code being unusable by upstream message
resolvers.
Fixes gh-28930
2021-12-16 12:20:37 -06:00
3039272a70
Merge branch '2.6.x' into 2.7.x
2021-12-16 17:51:47 +01:00
6555ad404e
Merge branch '2.5.x' into 2.6.x
2021-12-16 17:51:40 +01:00
f2efe56a18
Upgrade to Spring Framework 5.3.14
2021-12-16 17:51:27 +01:00
a7a37f4ad6
Upgrade to Spring Framework 5.3.14
...
Closes gh-28970
2021-12-16 17:50:53 +01:00
b8bf2cbbc7
Upgrade to Spring Framework 5.3.14
...
Closes gh-28961
2021-12-16 17:50:18 +01:00
63427b77d1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29086
2021-12-16 17:30:36 +01:00
55859ea64c
Stop accessing the datasource if initialization mode is set to never
...
Closes gh-28931
2021-12-16 16:50:22 +01:00
b85b6b06a6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29078
2021-12-15 22:18:41 -08:00
6e01c3edbe
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29077
2021-12-15 22:17:22 -08:00
17363d1b3a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-29076
2021-12-15 22:16:37 -08:00
1749c893dc
Update web-app version to 3.1
...
Update the web-app version specified in `web.xml` to 3.1 in order to
make Eclipse happy.
Closes gh-29075
2021-12-15 22:14:52 -08:00
a773af0387
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29073
2021-12-15 14:05:31 -06:00
Stephane Nicoll
Madhura Bhave
Andy Wilkinson
Brian Clozel
Pavel Anisimov
Phillip Webb
Scott Frederick