Scott Frederick
e4b0575a12
Do not consider bridge methods when binding java bean properties
...
Fixes gh-28917
2021-12-20 13:57:36 -06:00
Madhura Bhave
ad45e76b1b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29139
2021-12-20 09:21:23 -08:00
Madhura Bhave
84f1a6ca09
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29138
2021-12-20 09:21:08 -08:00
Madhura Bhave
99e650bd27
Document devtools remote support not available with WebFlux
...
Closes gh-28955
2021-12-20 09:19:34 -08:00
Stephane Nicoll
83d732823d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29136
2021-12-20 18:08:00 +01:00
Stephane Nicoll
653fdbd0a4
Configure comment prefixes
...
Closes gh-29095
2021-12-20 17:47:50 +01:00
Stephane Nicoll
dea15a1103
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29134
2021-12-20 12:37:25 +01:00
Stephane Nicoll
53654a0160
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29133
2021-12-20 12:37:10 +01:00
Pavel Anisimov
b704ee0b30
Polish reference doc
...
See gh-29115
2021-12-20 12:36:33 +01:00
Stephane Nicoll
fd32ff3a51
Upgrade to XmlUnit2 2.8.4
...
Closes gh-29131
2021-12-20 10:48:31 +01:00
Stephane Nicoll
fbb7f12f43
Upgrade to XmlUnit2 2.8.4
...
Closes gh-29123
2021-12-20 10:48:17 +01:00
Stephane Nicoll
64a5415edc
Upgrade to Jackson Bom 2.13.1
...
Closes gh-29129
2021-12-20 10:46:31 +01:00
Stephane Nicoll
d9a970a8e2
Upgrade to Infinispan 12.1.10.Final
...
Closes gh-29128
2021-12-20 10:46:30 +01:00
Stephane Nicoll
a8fc4e9351
Upgrade to Hibernate 5.6.3.Final
...
Closes gh-29127
2021-12-20 10:46:29 +01:00
Stephane Nicoll
07c8ab2236
Upgrade to Ehcache3 3.9.9
...
Closes gh-29126
2021-12-20 10:46:27 +01:00
Stephane Nicoll
9ec44d80cf
Upgrade to Dropwizard Metrics 4.2.7
...
Closes gh-29125
2021-12-20 10:46:25 +01:00
Stephane Nicoll
177fd6c539
Upgrade to DB2 JDBC 11.5.7.0
...
Closes gh-29124
2021-12-20 10:46:22 +01:00
Stephane Nicoll
620c6ec275
Upgrade to Infinispan 12.1.10.Final
...
Closes gh-29121
2021-12-20 09:57:12 +01:00
Stephane Nicoll
d0cd7dcf60
Upgrade to Hibernate 5.4.33
...
Closes gh-29120
2021-12-20 09:57:11 +01:00
Stephane Nicoll
cb81801907
Upgrade to Ehcache3 3.9.9
...
Closes gh-29119
2021-12-20 09:57:10 +01:00
Stephane Nicoll
d8d97df34a
Upgrade to Dropwizard Metrics 4.1.29
...
Closes gh-29118
2021-12-20 09:57:08 +01:00
Stephane Nicoll
8306287158
Upgrade to DB2 JDBC 11.5.7.0
...
Closes gh-29117
2021-12-20 09:57:06 +01:00
Stephane Nicoll
bb1a1a0622
Upgrade to Spring LDAP 2.3.5
...
Closes gh-28972
2021-12-19 18:46:18 +01:00
Stephane Nicoll
f619d66244
Upgrade to Spring LDAP 2.3.5
...
Closes gh-28963
2021-12-19 18:45:23 +01:00
Stephane Nicoll
aab30b13b3
Start building against Spring Kafka 2.7.10 snapshots
...
See gh-29114
2021-12-19 18:30:54 +01:00
Stephane Nicoll
4fa0e87ba1
Merge branch '2.6.x' into 2.7.x
2021-12-18 12:24:51 +01:00
Stephane Nicoll
efa93506e6
Fix checkstyle violations
2021-12-18 12:23:53 +01:00
Stephane Nicoll
84ef1f7c21
Upgrade to Log4j2 2.17.0
...
Closes gh-28985
2021-12-18 08:53:36 +01:00
Stephane Nicoll
012fbdd43d
Upgrade to Log4j2 2.17.0
...
Closes gh-28984
2021-12-18 08:53:04 +01:00
Stephane Nicoll
cb02944c71
Upgrade to Log4j2 2.17.0
...
Closes gh-28983
2021-12-18 08:52:22 +01:00
Madhura Bhave
d803c53e02
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29109
2021-12-17 17:57:33 -08:00
Madhura Bhave
4cc8012bfa
Handle WebServerNamespace in CachingOperationInvoker
...
Fixes gh-28882
2021-12-17 17:55:06 -08:00
Madhura Bhave
764531c326
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29108
2021-12-17 17:51:29 -08:00
Madhura Bhave
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
Stephane Nicoll
64dd1f86c0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29104
2021-12-17 16:38:07 +01:00
Stephane Nicoll
c077ebecf7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29103
2021-12-17 16:37:53 +01:00
Andy Wilkinson
2fec06ac7e
Find annotation without initializing factory beans
...
Closes gh-28977
2021-12-17 16:08:30 +01:00
Brian Clozel
b04f7904ff
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29013
2021-12-17 12:15:15 +01:00
Brian Clozel
1c35ec2c3c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29012
2021-12-17 12:14:31 +01:00
Brian Clozel
5d0206320a
Upgrade to Logback 1.2.9
...
Closes gh-29011
2021-12-17 12:13:02 +01:00
Stephane Nicoll
de383fcee0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29099
2021-12-17 10:50:15 +01:00
Stephane Nicoll
bcaa59ce73
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29098
2021-12-17 10:50:07 +01:00
Pavel Anisimov
415c58e21b
Polish CacheManager customization section in reference doc
...
See gh-29094
2021-12-17 10:48:55 +01:00
Stephane Nicoll
a05714ad9f
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29097
2021-12-17 10:30:42 +01:00
Stephane Nicoll
10362a9315
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29096
2021-12-17 10:30:26 +01:00
Stephane Nicoll
8c9d398422
Test our Gradle plugin against Gradle 7.3.2
...
Closes gh-29093
2021-12-17 09:11:44 +01:00
Phillip Webb
1015df088d
Merge branch '2.6.x' into 2.7.x
2021-12-16 13:55:55 -08:00
Phillip Webb
587d6fa309
Polish
2021-12-16 13:55:42 -08:00
Phillip Webb
f3bcbca841
Update copyright year of changed files
2021-12-16 13:05:17 -08:00
Scott Frederick
4cad4851da
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29088
2021-12-16 12:24:12 -06:00
Scott Frederick
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
Stephane Nicoll
f2efe56a18
Upgrade to Spring Framework 5.3.14
2021-12-16 17:51:27 +01:00
Stephane Nicoll
a7a37f4ad6
Upgrade to Spring Framework 5.3.14
...
Closes gh-28970
2021-12-16 17:50:53 +01:00
Stephane Nicoll
b8bf2cbbc7
Upgrade to Spring Framework 5.3.14
...
Closes gh-28961
2021-12-16 17:50:18 +01:00
Stephane Nicoll
63427b77d1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29086
2021-12-16 17:30:36 +01:00
Stephane Nicoll
55859ea64c
Stop accessing the datasource if initialization mode is set to never
...
Closes gh-28931
2021-12-16 16:50:22 +01:00
Stephane Nicoll
4b1c0e5a03
Start building against Spring Framework 5.3.14 snapshots
2021-12-15 16:52:41 +01:00
Stephane Nicoll
38aeeee381
Merge branch '2.6.x' into 2.7.x
2021-12-15 16:41:19 +01:00
Stephane Nicoll
3b4d27e4d3
Merge branch '2.5.x' into 2.6.x
2021-12-15 16:41:09 +01:00
Stephane Nicoll
30ebb17b2b
Polish
2021-12-15 16:38:27 +01:00
Stephane Nicoll
a5734ef194
Upgrade to Reactor 2020.0.14
...
Closes gh-28969
2021-12-15 15:12:20 +01:00
Stephane Nicoll
28214e1e8c
Upgrade to Reactor 2020.0.14
...
Closes gh-28960
2021-12-15 15:11:38 +01:00
Stephane Nicoll
4f14428351
Upgrade to Undertow 2.2.14.Final
...
Closes gh-29072
2021-12-15 15:11:24 +01:00
Stephane Nicoll
a4fbc98667
Upgrade to Thymeleaf 3.0.14.RELEASE
...
Closes gh-29070
2021-12-15 15:11:21 +01:00
Stephane Nicoll
45e8711b5b
Upgrade to Spring WS 3.1.2
...
Closes gh-29069
2021-12-15 15:11:20 +01:00
Stephane Nicoll
3bbc4649b7
Upgrade to MSSQL JDBC 9.4.1.jre8
...
Closes gh-29068
2021-12-15 15:11:19 +01:00
Stephane Nicoll
36332d42b8
Upgrade to JUnit Jupiter 5.8.2
...
Closes gh-29066
2021-12-15 15:11:16 +01:00
Stephane Nicoll
657f6e0010
Upgrade to Jedis 3.7.1
...
Closes gh-29065
2021-12-15 15:11:15 +01:00
Stephane Nicoll
afd254424b
Upgrade to JDOM2 2.0.6.1
...
Closes gh-29064
2021-12-15 15:11:14 +01:00
Stephane Nicoll
7156e3fb23
Upgrade to HttpCore 4.4.15
...
Closes gh-29063
2021-12-15 15:11:13 +01:00
Stephane Nicoll
0219408b7e
Upgrade to HttpAsyncClient 4.1.5
...
Closes gh-29062
2021-12-15 15:11:11 +01:00
Stephane Nicoll
081d4f6d9c
Upgrade to Hibernate 5.6.2.Final
...
Closes gh-29061
2021-12-15 15:11:10 +01:00
Stephane Nicoll
76b1ec3cac
Upgrade to Hazelcast 4.2.3
...
Closes gh-29060
2021-12-15 15:11:09 +01:00
Stephane Nicoll
84d552f4d2
Upgrade to Flyway 8.0.5
...
Closes gh-29059
2021-12-15 15:11:08 +01:00
Stephane Nicoll
fedf341d65
Upgrade to Ehcache3 3.9.8
...
Closes gh-29058
2021-12-15 15:11:07 +01:00
Stephane Nicoll
0165c40f02
Upgrade to Dropwizard Metrics 4.2.5
...
Closes gh-29057
2021-12-15 15:11:05 +01:00
Stephane Nicoll
b11aa6d5cd
Upgrade to Couchbase Client 3.2.4
...
Closes gh-29056
2021-12-15 15:11:04 +01:00
Stephane Nicoll
d80e68adf0
Upgrade to Caffeine 2.9.3
...
Closes gh-29055
2021-12-15 15:11:03 +01:00
Stephane Nicoll
c45bdd19fd
Upgrade to AppEngine SDK 1.9.93
...
Closes gh-29054
2021-12-15 15:11:01 +01:00
Stephane Nicoll
97ee63b55b
Upgrade to Undertow 2.2.14.Final
...
Closes gh-29051
2021-12-15 14:01:27 +01:00
Stephane Nicoll
74ce8b7516
Upgrade to Thymeleaf 3.0.14.RELEASE
...
Closes gh-29049
2021-12-15 14:01:25 +01:00
Stephane Nicoll
e234ccd457
Upgrade to Spring WS 3.1.2
...
Closes gh-29048
2021-12-15 14:01:24 +01:00
Stephane Nicoll
272e184259
Upgrade to JDOM2 2.0.6.1
...
Closes gh-29046
2021-12-15 14:01:21 +01:00
Stephane Nicoll
084eae5124
Upgrade to Jackson Bom 2.12.6
...
Closes gh-29045
2021-12-15 14:01:20 +01:00
Stephane Nicoll
d60c0593f3
Upgrade to HttpCore 4.4.15
...
Closes gh-29044
2021-12-15 14:01:19 +01:00
Stephane Nicoll
8c10266c62
Upgrade to HttpAsyncClient 4.1.5
...
Closes gh-29043
2021-12-15 14:01:18 +01:00
Stephane Nicoll
70805793a1
Upgrade to Hazelcast 4.1.7
...
Closes gh-29042
2021-12-15 14:01:16 +01:00
Stephane Nicoll
f0a4ac6154
Upgrade to Ehcache3 3.9.8
...
Closes gh-29041
2021-12-15 14:01:15 +01:00
Stephane Nicoll
41a9b08049
Upgrade to Dropwizard Metrics 4.1.27
...
Closes gh-29040
2021-12-15 14:01:14 +01:00
Stephane Nicoll
b7e233805f
Upgrade to Caffeine 2.9.3
...
Closes gh-29039
2021-12-15 14:01:12 +01:00
Stephane Nicoll
6dcc289e6b
Upgrade to AppEngine SDK 1.9.93
...
Closes gh-29038
2021-12-15 14:01:11 +01:00
Stephane Nicoll
61bb068a48
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29032
2021-12-15 09:42:38 +01:00
Stephane Nicoll
da60b96cf5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29031
2021-12-15 09:42:30 +01:00
copbint
0a9a6639e5
Remove redundant log4j-to-slf4j
...
See gh-29019
2021-12-15 09:40:10 +01:00
Stephane Nicoll
894eb83e66
Upgrade to Log4j2 2.16.0
...
Closes gh-28985
2021-12-15 09:31:04 +01:00
Stephane Nicoll
15ade0b5d3
Upgrade to Log4j2 2.16.0
...
Closes gh-28984
2021-12-15 09:30:10 +01:00
Stephane Nicoll
4c57d1717d
Upgrade to Log4j2 2.16.0
...
Closes gh-28983
2021-12-15 09:28:44 +01:00
Stephane Nicoll
3124d9e62d
Start building against Spring Kafka 2.8.1 snapshots
...
See gh-29017
2021-12-14 15:39:27 +01:00
Stephane Nicoll
9ca1cffab7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29016
2021-12-14 15:32:13 +01:00
Stephane Nicoll
ba60e3d358
Merge branch '2.5.x'
...
Closes gh-29002
2021-12-14 15:31:45 +01:00
Stephane Nicoll
157b3aa25f
Allow platform to be configured in DataSourceInitializers
...
Closes gh-28932
2021-12-14 15:07:32 +01:00
Stephane Nicoll
2d94fc437c
Upgrade to Logback 1.2.8
...
Closes gh-29013
2021-12-14 14:29:56 +01:00
Stephane Nicoll
d8eab45146
Upgrade to Logback 1.2.8
...
Closes gh-29012
2021-12-14 14:29:26 +01:00
Stephane Nicoll
d18eae35e5
Upgrade to Logback 1.2.8
...
Closes gh-29011
2021-12-14 14:26:12 +01:00
Stephane Nicoll
6adbb50f02
Upgrade to Netty 4.1.72.Final
...
Closes gh-29005
2021-12-13 18:25:06 +01:00
Stephane Nicoll
1bda928ad3
Upgrade to Netty 4.1.72.Final
...
Closes gh-29004
2021-12-13 17:55:38 +01:00
Stephane Nicoll
5383de4fe1
Merge branch '2.6.x' into 2.7.x
2021-12-13 09:23:44 +01:00
Stephane Nicoll
32ecbb89d6
Merge branch '2.5.x' into 2.6.x
2021-12-13 09:23:33 +01:00
Stephane Nicoll
496cd3d2ba
Polish
...
See gh-28999
2021-12-13 09:23:08 +01:00
Stephane Nicoll
b81adecde3
Start building against Spring AMQP 2.4.1 snapshots
...
See gh-28995
2021-12-11 17:19:42 +01:00
Stephane Nicoll
93f75a7d12
Start building against Spring AMQP 2.3.13 snapshots
...
See gh-28994
2021-12-11 17:19:08 +01:00
Stephane Nicoll
87fc7672d8
Upgrade to Log4j2 2.15.0
...
Closes gh-28985
2021-12-10 14:47:26 +01:00
Stephane Nicoll
4f85d8a4b0
Upgrade to Log4j2 2.15.0
...
Closes gh-28984
2021-12-10 14:46:11 +01:00
Stephane Nicoll
1d8e3a865e
Upgrade to Log4j2 2.15.0
...
Closes gh-28983
2021-12-10 14:44:50 +01:00
Stephane Nicoll
b961b14d0f
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28980
2021-12-10 11:02:02 +01:00
Stephane Nicoll
dfab6ee307
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28979
2021-12-10 11:01:48 +01:00
Stephane Nicoll
f6f5aec183
Polish "Check for the presence of Spring Security"
...
See gh-28967
2021-12-10 10:59:00 +01:00
Guirong Hu
4462f9157e
Check for the presence of Spring Security
...
See gh-28967
2021-12-10 10:58:30 +01:00
Stephane Nicoll
c7b606d8b6
Start building against Spring Integration 5.5.7 snapshots
...
See gh-28975
2021-12-10 08:19:23 +01:00
Stephane Nicoll
018481e381
Start building against Spring Session 2021.1.1 snapshots
...
See gh-28974
2021-12-10 08:18:55 +01:00
Stephane Nicoll
8792f1a792
Start building against Spring Security 5.6.1 snapshots
...
See gh-28973
2021-12-10 08:18:26 +01:00
Stephane Nicoll
9dc2450cd7
Start building against Spring LDAP 2.3.5 snapshots
...
See gh-28972
2021-12-10 08:17:55 +01:00
Stephane Nicoll
d471397f47
Upgrade to Micrometer 1.8.1
...
Closes gh-28971
2021-12-10 08:17:17 +01:00
Stephane Nicoll
84ba9e2a8f
Start building against Spring Framework 5.3.14 snapshots
...
See gh-28970
2021-12-10 08:16:47 +01:00
Stephane Nicoll
ec453acf7f
Start building against Reactor 2020.0.14 snapshots
...
See gh-28969
2021-12-10 08:16:21 +01:00
Stephane Nicoll
f1f43e8577
Start building against Spring Integration 5.5.7 snapshots
...
See gh-28966
2021-12-10 06:54:25 +01:00
Stephane Nicoll
e53bac272c
Start building against Spring Session 2021.0.4 snapshots
...
See gh-28965
2021-12-10 06:54:01 +01:00
Stephane Nicoll
9894e90567
Start building against Spring Security 5.5.4 snapshots
...
See gh-28964
2021-12-10 06:53:38 +01:00
Stephane Nicoll
a3b31db31d
Start building against Spring LDAP 2.3.5 snapshots
...
See gh-28963
2021-12-10 06:53:13 +01:00
Stephane Nicoll
33ce2ab73b
Upgrade to Micrometer 1.7.7
...
Closes gh-28962
2021-12-10 06:51:25 +01:00
Stephane Nicoll
4a35c7111f
Start building against Spring Framework 5.3.14 snapshots
...
See gh-28961
2021-12-10 06:50:52 +01:00
Stephane Nicoll
7af3bd54a1
Start building against Reactor 2020.0.14 snapshots
...
See gh-28960
2021-12-10 06:50:21 +01:00
Scott Frederick
8f57f0babb
Add classpath index support for exploded war archives
...
Update the Maven and Gradle packaging for war files so that a
`classpath.idx` file is written into the archive that provides the
original order of the classpath, as was previously done for jar files.
The `WarLauncher` class will use this file when running as an exploded
archive to ensure that the classpath order is the same as when running
from the far war.
Fixes gh-19875
2021-12-09 16:41:49 -06:00
Stephane Nicoll
a2eeb77e21
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28951
2021-12-09 16:00:09 +01:00
Vedran Pavic
0af4431db8
Apply SameSite session cookie property to Spring Session
...
This commit maps the `server.servlet.session.cookie.same-site`
configuration property to the `DefaultCookieSerializer` bean configured
in the Spring Session auto-configuration.
See gh-28784
2021-12-09 15:53:50 +01:00
Stephane Nicoll
89635eafa3
Update copyright year of changed files
...
See gh-28862
2021-12-09 15:48:47 +01:00
Stefano Cordio
a5c56043b9
Simplify AssertJ usage
...
See gh-28862
2021-12-09 15:39:02 +01:00
Stephane Nicoll
2b3827332f
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28946
2021-12-09 15:09:46 +01:00
izeye
0364353204
Add public accessor for StackdriverProperties.useSemanticMetricTypes
...
See gh-28944
2021-12-09 15:09:13 +01:00
Stephane Nicoll
a323ff7136
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28945
2021-12-09 15:06:26 +01:00
Stephane Nicoll
5599e8d340
Polish "Add consistent quotes in YAML samples of reference doc"
...
See gh-28911
2021-12-09 15:02:47 +01:00
Viktor Ardelean
0b781d87b1
Add consistent quotes in YAML samples of reference doc
...
See gh-28911
2021-12-09 15:02:23 +01:00
Andy Wilkinson
51957f18c4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28942
2021-12-09 12:52:04 +00:00
Artur Signell
ad754abba3
Make ErrorPageSecurityFilter compatible with Servlet 3.1
...
See gh-28902
2021-12-09 12:36:35 +00:00
Stephane Nicoll
7af589d31a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28937
2021-12-09 10:46:04 +01:00
Stephane Nicoll
25a2888be5
Fix default value of spring.mvc.pathmatch.matching-strategy property
...
Closes gh-28936
2021-12-09 10:45:21 +01:00
Scott Frederick
3cb30cb283
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28923
2021-12-07 14:10:46 -06:00
Scott Frederick
3555837845
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28922
2021-12-07 14:10:28 -06:00
Scott Frederick
b0b2cd79b4
Use latest buildpack image tag when no tag is provided
...
Fixes gh-28921
2021-12-07 14:10:10 -06:00
Scott Frederick
61fb9f83df
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28905
2021-12-03 11:42:28 -06:00
Scott Frederick
ab0cc55e20
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28904
2021-12-03 11:42:03 -06:00
Scott Frederick
467c092fdc
Remove classpath index manifest attribute from repackaged war files
...
Fixes gh-28895
2021-12-03 11:41:28 -06:00
Andy Wilkinson
a3ecdcf058
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28892
2021-12-02 10:31:11 +00:00
Andy Wilkinson
4606e17696
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28891
2021-12-02 10:30:51 +00:00
Andy Wilkinson
af60a8a7cf
Test our Gradle plugin against Gradle 7.3.1
...
Closes gh-28890
2021-12-02 10:29:22 +00:00
Scott Frederick
5f14cffea3
Add support for CNB platform API 0.5 through 0.8
...
Fixes gh-28850
2021-12-01 14:05:20 -06:00
Andy Wilkinson
86a773a8e9
Update main branch to start work on 2.7.x
2021-11-30 11:16:53 +00:00
Stephane Nicoll
46a8673bf8
Merge branch '2.5.x'
...
Closes gh-28839
2021-11-29 09:44:31 +01:00
Stephane Nicoll
1876b4bcd7
Update copyright year of changed files
...
See gh-28809
2021-11-29 09:43:44 +01:00
Leo Li
f3c93d30a8
Fix reference to matching-strategy property
...
See gh-28809
2021-11-29 09:39:40 +01:00
izeye
c7921468fc
Polish
...
See gh-28836
2021-11-29 09:38:07 +01:00
Stephane Nicoll
88aa849f90
Merge branch '2.5.x'
2021-11-29 09:37:31 +01:00
Stephane Nicoll
1bb3f906a7
Polish
...
See gh-28836
2021-11-29 09:35:51 +01:00
Stephane Nicoll
e4082ee5d9
Merge branch '2.5.x'
...
Closes gh-28834
2021-11-28 11:18:57 +01:00
fml2
1d786e49e9
Fix typos in the "External Application Properties" section
...
See gh-28830
2021-11-28 11:17:22 +01:00
Stephane Nicoll
9719930496
Merge branch '2.5.x'
...
Closes gh-28833
2021-11-28 11:14:52 +01:00
Xavier Bouclet
dce979d51f
Fix output of "spring --version" in reference documentation
...
See gh-28831
2021-11-28 11:14:14 +01:00
Andy Wilkinson
4bd86a6e20
Allow spring-boot-image-tests to run without an existing snapshot
...
Closes gh-28817
2021-11-26 13:01:34 +00:00
Željko Tomić
1c1c85c3f8
Fix MariaDB mapping for Quartz DataSource initialization
...
See gh-28779
2021-11-25 09:38:44 +01:00
Madhura Bhave
27eb992252
Fix property source ordering in SpringBootTest
...
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.
Closes gh-28804
2021-11-24 10:29:35 -08:00
Phillip Webb
beb68671bb
Update copyright year of changed files
2021-11-24 10:23:32 -08:00
Madhura Bhave
e7ff2cf358
Guard ErrorPageSecurityFilter configuration with ConditionalOnClass
...
Update `ErrorPageSecurityFilterConfiguration` to guard against the case
where `spring-security-core` is on the classpath but
`spring-security-web` is not.
Fixes gh-28774
2021-11-24 10:20:29 -08:00
Madhura Bhave
49e408828c
Fix property source ordering in SpringBootTest
...
Update `SpringBootContextLoader` so that the active profiles
property source has a unique name. Prior to this commit, the
default name 'test' was used which could cause ordering issues
if other `@PropertySource` values were added to it later.
Fixes gh-28776
2021-11-24 10:17:02 -08:00
Madhura Bhave
e6b5be900a
Make ErrorPageSecurityFilter Servlet 3.1 compatible
...
Restore Servlet 3.1 compatibly by implementing `Filter` rather
than extending the 4.0 `HttpFilter` type.
Fixes gh-28790
2021-11-24 09:59:27 -08:00
Madhura Bhave
f621937d3b
Skip error page security filter for non-error dispatch type
...
Update `ErrorPageSecurityFilter` to defensively check that the
`DispatcherType` is `ERROR`. Although this check isn't necessary
for regular applications, it is needed if MockMvc is being used.
Fixes gh-28759
2021-11-24 09:55:59 -08:00
Scott Frederick
4eed637481
Merge branch '2.5.x'
...
Closes gh-28789
2021-11-23 12:45:46 -06:00
Scott Frederick
12244a8edd
Remove use of Thymeleaf from smoke tests
...
Closes gh-28788
2021-11-23 12:13:05 -06:00
Andy Wilkinson
03e283a2e6
Mention WebProperties in deprecation of ResourceProperties
...
Closes gh-28762
2021-11-22 10:03:21 +00:00
Yanming Zhou
da2dfbe0aa
LettuceMetricsAutoConfiguration should not build ClientResources
...
See gh-28767
2021-11-22 09:49:07 +01:00
Stephane Nicoll
490ec8974d
Merge branch '2.5.x'
...
Closes gh-28761
2021-11-20 17:30:35 +01:00
Stephane Nicoll
667bca05ec
Polish "Add package info for Spring Data metrics support"
...
See gh-28756
2021-11-20 17:29:52 +01:00
charissathomas
42ae5114ef
Create package-info.java
...
Closes #28731
2021-11-20 17:29:22 +01:00
Andy Wilkinson
0074d621d0
Merge branch '2.5.x'
...
Closes gh-28754
2021-11-19 15:37:32 +00:00
Andy Wilkinson
015cf920da
Name custom task inputs
...
Closes gh-28753
2021-11-19 15:35:39 +00:00
Andy Wilkinson
258222781a
Merge branch '2.5.x'
...
Closes gh-28752
2021-11-19 14:52:03 +00:00
Andy Wilkinson
96d98a0f6f
Declare dir task inputs with relative path sensitivity
...
Closes gh-28751
2021-11-19 14:29:29 +00:00
Andy Wilkinson
c0d90dfa8f
Merge branch '2.5.x'
...
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson
c083e0b049
Avoid using temp before @TempDir has initialized it
...
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson
4a0fa62d2e
Polish "Replace "you're""
...
See gh-28710
2021-11-19 13:24:17 +00:00
Jay Bryant
e629e77b29
Replace "you're"
...
This commit replaces "you're" with some other structure, often
simplifying the sentence in the process.
Also checked for words that end with "'ll" and "n't" but did not find
any.
See gh-28710
2021-11-19 13:23:10 +00:00
Andy Wilkinson
00fa0fb769
Merge branch '2.5.x'
...
Closes gh-28746
2021-11-19 10:19:14 +00:00
Andy Wilkinson
f2b959b0a5
Add <type>zip</type> to Elasticsearch dist in dependencies bom
...
Fixes gh-28725
2021-11-19 10:13:14 +00:00
Madhura Bhave
dd1d1482dc
Deny unauthorized access to the error page
...
Fixes gh-26356
Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-11-18 15:41:38 -08:00
Andy Wilkinson
29725ec68a
Update links to Spring Security's reference docs
...
Closes gh-28618
2021-11-18 11:59:48 +00:00
Madhura Bhave
6b79d2860f
Merge branch '2.5.x' into main
...
Closes gh-28724
2021-11-17 16:41:23 -08:00
Madhura Bhave
64270eca51
Convert environment used by SpringBootTestContextLoader
...
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.
The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.
Fixes gh-28530
2021-11-17 16:40:53 -08:00
Stephane Nicoll
7fbb9d471b
Polish "Upgrade to Neo4j Java Driver 4.2.8"
...
See gh-28717
2021-11-17 16:14:25 +01:00
Stephane Nicoll
a6163f6acf
Upgrade to Netty tcNative 2.0.46.Final
...
Closes gh-28720
2021-11-17 15:03:59 +01:00
Stephane Nicoll
fc69be302a
Upgrade to HttpClient5 5.1.2
...
Closes gh-28719
2021-11-17 15:03:57 +01:00
Stephane Nicoll
f33c8f6fde
Upgrade to Netty tcNative 2.0.46.Final
...
Closes gh-28718
2021-11-17 15:02:27 +01:00