root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity
33,268 Commits 23 Branches 348 Tags 288 MiB
Commit Graph

14048 Commits

Author SHA1 Message Date
Stephane Nicoll 9f4a6af93a Upgrade to HtmlUnit 2.51.0 
Closes gh-27261
 2021-07-12 08:46:17 +02:00
Stephane Nicoll f5b75c702d Upgrade to Hazelcast 4.2.1 
Closes gh-27260
 2021-07-12 08:46:17 +02:00
Stephane Nicoll 4be169ae64 Upgrade to Elasticsearch 7.13.3 
Closes gh-27259
 2021-07-12 08:46:17 +02:00
Stephane Nicoll 108616bf48 Upgrade to Dropwizard Metrics 4.2.2 
Closes gh-27258
 2021-07-12 08:46:17 +02:00
Stephane Nicoll 1397e11e5f Upgrade to DB2 JDBC 11.5.6.0 
Closes gh-27257
 2021-07-12 08:46:17 +02:00
Stephane Nicoll f4cc3010de Upgrade to Commons Pool2 2.10.0 
Closes gh-27256
 2021-07-12 08:46:16 +02:00
Stephane Nicoll b73a2e3e73 Upgrade to Cassandra Driver 4.12.0 
Closes gh-27255
 2021-07-12 07:55:28 +02:00
Stephane Nicoll a4709f0979 Upgrade to Caffeine 2.9.2 
Closes gh-27254
 2021-07-12 07:55:28 +02:00
Stephane Nicoll 6f09109a73 Upgrade to Byte Buddy 1.11.6 
Closes gh-27253
 2021-07-12 07:55:28 +02:00
Stephane Nicoll 580e01283a Upgrade to Awaitility 4.1.0 
Closes gh-27252
 2021-07-12 07:55:27 +02:00
Stephane Nicoll 69ac69050c Upgrade to AssertJ 3.20.2 
Closes gh-27251
 2021-07-12 07:55:27 +02:00
Stephane Nicoll 49134f870e Upgrade to AspectJ 1.9.7 
Closes gh-27250
 2021-07-12 07:55:27 +02:00
Stephane Nicoll 4c3847d3f1 Switch bomr to any policy 2021-07-12 07:41:15 +02:00
Stephane Nicoll c5bf56d87f Upgrade to Kafka 2.8.0 
As part of the upgrade, a switch to Spring Kafka 2.8.0-SNAPSHOT is
required, see gh-27177

Closes gh-27247
 2021-07-11 18:28:41 +02:00
Stephane Nicoll 895a2ed013 Upgrade to Postgresql 42.2.23 
Closes gh-27244
 2021-07-11 08:12:08 +02:00
Stephane Nicoll bed528f203 Upgrade to jOOQ 3.14.12 
Closes gh-27243
 2021-07-11 08:12:07 +02:00
Stephane Nicoll 5811b22554 Upgrade to Johnzon 1.2.14 
Closes gh-27242
 2021-07-11 08:12:07 +02:00
Stephane Nicoll 3c6db2bc28 Upgrade to Jetty 9.4.43.v20210629 
Closes gh-27241
 2021-07-11 08:12:06 +02:00
Stephane Nicoll 58b03ac56f Upgrade to Jetty Reactive HTTPClient 1.1.10 
Closes gh-27240
 2021-07-11 08:12:05 +02:00
Stephane Nicoll 88e0916ad6 Upgrade to DB2 JDBC 11.5.6.0 
Closes gh-27239
 2021-07-11 08:12:04 +02:00
Stephane Nicoll 2d671021d9 Upgrade to AspectJ 1.9.7 
Closes gh-27238
 2021-07-11 08:12:02 +02:00
Stephane Nicoll d67089cdfe Merge branch '2.5.x' 
Closes gh-27236
 2021-07-10 17:38:44 +02:00
dreis2211 dacfe27350 Fix tests for multi-release JARs on JDK 17 
See gh-27229
 2021-07-10 17:38:16 +02:00
Andy Wilkinson 9469bfa8c5 Upgrade to Querydsl 5.0.0.M1 
Closes gh-26956
 2021-07-10 16:23:43 +01:00
Andy Wilkinson 7b0cc3afb5 Merge branch '2.5.x' 
Closes gh-27227
 2021-07-09 15:05:44 +01:00
Andy Wilkinson 1cd3a54e88 Rework Quartz DB init dependencies to use a detector 
Closes gh-27222
 2021-07-09 15:02:15 +01:00
Andy Wilkinson 7a1c923fec Merge branch '2.5.x' 
Closes gh-27226
 2021-07-09 14:18:18 +01:00
Andy Wilkinson 3de58c2340 Detect JdbcIndexedSessionRepository as depending on DB init 
Fixes gh-27220
 2021-07-09 14:17:23 +01:00
Andy Wilkinson 0b604f5e3b Merge branch '2.5.x' 
Closes gh-27224
 2021-07-09 13:47:41 +01:00
Stephane Nicoll 7a7901f0c5 Start building against Spring Security 5.6.0-M1 snapshots 
See gh-27173
 2021-07-09 13:48:40 +02:00
Stephane Nicoll 8d4f3e722f Start building against Micrometer 1.8.0-M1 snapshots 
See gh-27169
 2021-07-09 13:48:39 +02:00
Stephane Nicoll b20fdd6ea8 Start building against Spring Integration 5.5.2 snapshots 
See gh-27174
 2021-07-09 13:48:39 +02:00
Stephane Nicoll 3191b814e0 Start building against Spring AMQP 2.4.0-M1 snapshots 
See gh-27171
 2021-07-09 13:48:39 +02:00
Stephane Nicoll 4f322411a5 Start building against Spring Data 2021.1.0-M1 snapshots 
See gh-27170
 2021-07-09 13:48:39 +02:00
Stephane Nicoll 1827d559fb Start building against Spring HATEOAS 1.4.0 snapshots 
See gh-27185
 2021-07-09 13:48:39 +02:00
Stephane Nicoll cd79a47a3d Start building against Spring Framework 5.3.9 snapshots 
See gh-27168
 2021-07-09 13:48:39 +02:00
Stephane Nicoll 5981eba4f3 Start building against Reactor 2020.0.9 snapshots 
See gh-27167
 2021-07-09 13:48:39 +02:00
Andy Wilkinson f008228f1a Polish "Detect JobRepository as depending on DB init" 
See gh-27221
 2021-07-09 12:36:30 +01:00
Henning Pöttker cf69785393 Detect JobRepository as depending on DB init 
See gh-27221
 2021-07-09 12:36:19 +01:00
Andy Wilkinson d8d98e615b Merge branch '2.5.x' 
Closes gh-27223
 2021-07-09 12:22:33 +01:00
Andy Wilkinson 94f94f30f5 Polish "Detect AbstractDataSourceInitializers as DB initializers" 
See gh-27215
 2021-07-09 12:05:56 +01:00
Henning Pöttker 433f3d6bc4 Detect AbstractDataSourceInitializers as DB initializers 
See gh-27215
 2021-07-09 12:04:17 +01:00
Andy Wilkinson 7b94b40a19 Ensure that Session JDBC schema is in place before DB is accessed 
Fixes gh-27208
 2021-07-09 11:12:52 +01:00
Andy Wilkinson 4b1b2d6603 Consider Flyway and Liquibase as possible Batch DB initializers 
This is a follow-on from 3fec4110 which only considered
BatchDataSourceInitializer as a possible initializer of Batch's
database schema. Flyway and Liquibase are now also considered.

Closes gh-27193
 2021-07-09 10:29:50 +01:00
Andy Wilkinson 3fec41104e Ensure that Batch schema is in place before DB is accessed 
Fixes gh-27193
 2021-07-09 09:47:48 +01:00
Stephane Nicoll 5bb6188f6d Merge branch '2.5.x' 
Closes gh-27218
 2021-07-09 10:44:40 +02:00
Stephane Nicoll 25fe6a107a Fix visibility of a type exposed as a bean 
Closes gh-27189
 2021-07-09 10:40:00 +02:00
Scott Frederick 18c7c0af22 Add Paketo image building system tests 
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.

The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.

Closes gh-25824
 2021-07-08 17:02:43 -05:00
Madhura Bhave d82b46b718 Merge branch '2.5.x' into main 
Closes gh-27212
Closes gh-27213
 2021-07-08 13:05:46 -07:00
Madhura Bhave 0f70c46746 Merge branch '2.4.x' into 2.5.x 
Closes gh-27210
Closes gh-27211
 2021-07-08 13:04:48 -07:00
Madhura Bhave 42e556dd73 Handle file with name matching an optional wildcard location 
Previously, the presence of a file with the same name
as an optional wildcard location would cause a failure. With
this change the pattern is resolved only if the resource is a
directory.

Additionally, if an optional wildcard search location that was a file
would also fail with an exception. This commit fixes that so that those
locations are not resolved.

Fixes gh-27120
Fixes gh-27209
 2021-07-08 13:01:15 -07:00
Phillip Webb cf5fc04ec5 Merge branch '2.5.x' 
Closes gh-27205
 2021-07-08 11:36:37 -07:00
Phillip Webb f32f4a2e3d Merge branch '2.4.x' into 2.5.x 
Closes gh-27204
 2021-07-08 11:36:25 -07:00
Phillip Webb 84110a22bc Don't change case of 'Sec-WebSocket-Key' 
Polish commit 5ca687c9a6 had an accidental side-effect of changing
the 'Sec-WebSocket-Key' header value to lowercase. This breaks
connections since the value needs to be echoed unchanged in the
"Sec-WebSocket-Accept" header.

Fixes gh-27147
 2021-07-08 11:29:29 -07:00
Andy Wilkinson b50cefbf8b Upgrade to Postgresql 42.2.23 
Closes gh-27202
 2021-07-08 18:44:11 +01:00
Andy Wilkinson bce7b9c711 Upgrade to jOOQ 3.14.12 
Closes gh-27201
 2021-07-08 18:44:09 +01:00
Andy Wilkinson 2c7105965d Upgrade to Johnzon 1.2.14 
Closes gh-27200
 2021-07-08 18:44:08 +01:00
Andy Wilkinson 81a68651dc Upgrade to Jetty 9.4.43.v20210629 
Closes gh-27199
 2021-07-08 18:44:07 +01:00
Andy Wilkinson d52117014f Upgrade to Jackson Bom 2.12.4 
Closes gh-27198
 2021-07-08 18:44:06 +01:00
Andy Wilkinson c96ee0d448 Upgrade to Infinispan 12.1.6.Final 
Closes gh-27197
 2021-07-08 18:44:04 +01:00
Andy Wilkinson 958c6649f4 Upgrade to DB2 JDBC 11.5.6.0 
Closes gh-27196
 2021-07-08 18:44:03 +01:00
Andy Wilkinson 4b965ac1ef Upgrade to Caffeine 2.9.2 
Closes gh-27195
 2021-07-08 18:44:02 +01:00
Andy Wilkinson bcbc742a0e Upgrade to AspectJ 1.9.7 
Closes gh-27194
 2021-07-08 18:44:00 +01:00
Andy Wilkinson 5ebe2f4539 Merge branch '2.5.x' 
Closes gh-27192
 2021-07-08 18:08:39 +01:00
dreis2211 00d3330c9a Avoid illegal reflective access on ZipEntry.xdostime 
See gh-27100
 2021-07-08 18:05:16 +01:00
Andy Wilkinson 87591d94ee Merge branch '2.5.x' 
Closes gh-27188
 2021-07-08 10:45:57 +01:00
Andy Wilkinson ff79787def Avoid using deprecated API to get Kotlin Plugin's version 
Closes gh-27090
 2021-07-08 10:45:09 +01:00
Andy Wilkinson bd1b73be94 Merge branch '2.5.x' 
Closes gh-27186
 2021-07-08 09:18:45 +01:00
Andy Wilkinson 283b4a6ed2 Improve error message for non-options-capable ConnectionFactory 
Fixes gh-26977
 2021-07-08 09:17:55 +01:00
Stephane Nicoll 7eb6cf71f6 Start building against Spring Integration 5.5.2 snapshots 
See gh-27166
 2021-07-08 08:52:18 +02:00
Stephane Nicoll e426ff6196 Start building against Spring Kafka 2.7.4 snapshots 
See gh-27165
 2021-07-08 08:51:55 +02:00
Stephane Nicoll 745b79714f Start building against Spring Data 2021.0.3 snapshots 
See gh-27164
 2021-07-08 08:51:29 +02:00
Stephane Nicoll 36f5d6762b Start building against Spring HATEOAS 1.3.3 snapshots 
See gh-27184
 2021-07-08 08:51:04 +02:00
Stephane Nicoll 3119179c62 Start building against Spring Framework 5.3.9 snapshots 
See gh-27163
 2021-07-08 08:50:32 +02:00
Stephane Nicoll 74a0354bf1 Start building against Reactor 2020.0.9 snapshots 
See gh-27162
 2021-07-08 08:50:06 +02:00
Stephane Nicoll 815ccd14b5 Start building against Spring Data 2020.0.11 snapshots 
See gh-27161
 2021-07-08 08:45:17 +02:00
Stephane Nicoll 434d4a6f76 Start building against Spring HATEOAS 1.2.8 snapshots 
See gh-27183
 2021-07-08 08:44:52 +02:00
Stephane Nicoll 861f87911c Start building against Spring Framework 5.3.9 snapshots 
See gh-27160
 2021-07-08 08:44:23 +02:00
Stephane Nicoll 74d5fdbcd0 Start building against Reactor 2020.0.9 snapshots 
See gh-27159
 2021-07-08 08:43:53 +02:00
Andy Wilkinson 7c744db0e9 Merge branch '2.5.x' 
Closes gh-27180
 2021-07-07 17:57:25 +01:00
Andy Wilkinson c21791e671 Test our Gradle plugin against Gradle 7.1.1 
Closes gh-27142
 2021-07-07 17:57:14 +01:00
Stephane Nicoll fa1eb544c1 Merge branch '2.5.x' 
Closes gh-27155
 2021-07-06 09:10:13 +02:00
Stephane Nicoll 888393d63b Merge branch '2.4.x' into 2.5.x 
Closes gh-27154
 2021-07-06 09:10:03 +02:00
Stephane Nicoll 5ec0c7ed12 Polish "Fix duration to microseconds conversion" 
See gh-27149
 2021-07-06 09:07:48 +02:00
marckchr a406a46fa1 Fix duration to microseconds conversion 
See gh-27149
 2021-07-06 09:07:47 +02:00
Madhura Bhave ce1dff86df Merge branch '2.5.x' into main 
See gh-27140
 2021-07-02 15:44:13 -07:00
Madhura Bhave c6acce569f Merge branch '2.4.x' into 2.5.x 
See gh-27139
 2021-07-02 15:43:15 -07:00
Madhura Bhave 877f618a69 Clarify that HATEOAS can be used with Webflux without starter 
Closes gh-26897
 2021-07-02 15:36:39 -07:00
Madhura Bhave 1dc8fa14c9 Merge branch '2.5.x' into main 
Closes gh-27140
 2021-07-01 16:02:35 -07:00
Madhura Bhave 503d50f39e Merge branch '2.4.x' into 2.5.x 
Closes gh-27139
 2021-07-01 15:59:12 -07:00
Madhura Bhave 6c4273b5c9 Document spring hateoas is spring mvc specific 
Closes gh-26897
 2021-07-01 15:54:01 -07:00
Madhura Bhave 1f3b32c3b9 Merge branch '2.5.x' into main 
Closes gh-27138
 2021-07-01 15:46:21 -07:00
Madhura Bhave 55593a7ac1 Merge branch '2.4.x' into 2.5.x 
Closes gh-27137
 2021-07-01 15:46:00 -07:00
Madhura Bhave eb4144eb97 Add clarification on when @DevaultValue is used during binding 
Closes gh-26742
 2021-07-01 15:39:16 -07:00
Madhura Bhave 32a1644cca Split spring boot features into multiple sections 
See gh-27132
 2021-06-30 22:17:48 -07:00
Stephane Nicoll 786d7cdb6e Merge branch '2.5.x' 
Closes gh-27118
 2021-06-29 09:09:14 +02:00
Stephane Nicoll ddf76c32c6 Update copyright year of updated file 
See gh-27085
 2021-06-29 08:28:08 +02:00
dreis2211 c852961011 Avoid reflection in tests 
See gh-27085
 2021-06-29 08:25:45 +02:00
Stephane Nicoll 573ca50333 Merge branch '2.5.x' 
Closes gh-27117
 2021-06-29 08:22:13 +02:00
Nurlan Tembayev e57970393c Remove unnecessary unit for spring.datasource.tomcat.max-active 
See gh-27103
 2021-06-29 08:21:50 +02:00
Stephane Nicoll 53fe7b71f6 Merge branch '2.5.x' 
Closes gh-27116
 2021-06-29 08:17:30 +02:00
biergit 79638a8f63 Fix anchor rewrites containing a question mark 
See gh-27107
 2021-06-29 08:09:45 +02:00
Stephane Nicoll 0f20c236da Merge branch '2.5.x' 
Closes gh-27112
 2021-06-28 08:07:31 +02:00
Cèsar Ordiñana 0c38449851 Fix typo in section title 
See gh-27102
 2021-06-28 08:06:57 +02:00
Brian Clozel f23fa2821c Merge branch '2.5.x' 
Closes gh-27106
 2021-06-25 19:38:39 +02:00
Brian Clozel 4db53601b5 Fix spring.netty.leak-detection metadata 
Fixes gh-27104
 2021-06-25 19:38:07 +02:00
Phillip Webb d00db60bab Merge branch '2.5.x' 2021-06-24 14:06:25 -07:00
Phillip Webb dfbd82b838 Fix Kotlin 1.5.20 classpath issues 
See gh-27086
 2021-06-24 14:05:36 -07:00
Phillip Webb 716e8ab717 Merge branch '2.5.x' 2021-06-24 11:31:33 -07:00
Phillip Webb d44207161f Suppress Kotlin 1.5.20 deprecation warning 
See gh-27086
 2021-06-24 11:30:58 -07:00
Andy Wilkinson 8b9991fcc7 Merge branch '2.5.x' 
Closes gh-27076
 2021-06-24 14:07:17 +01:00
Andy Wilkinson 5a9fa3c8f1 Only close context that is active 
Previously, SpringApplicationShutdownHook would call close() on any
registered application context even if it wasn't active as it had
already been closed. This could lead to deadlock if the context was
closed and System.exit was called during application context refresh.

This commit updates SpringApplicationShutdownHook so that it only
calls close() on active contexts. This prevents deadlock as it avoids
trying to sychronize on the context's startupShutdownMonitor on
the shutdown hook thread while it's still held on the main thread
which called System.exit and is waiting for all of the shutdown hooks
to complete.

Fixes gh-27049
 2021-06-24 14:07:02 +01:00
Andy Wilkinson d56ddb0f60 Merge branch '2.5.x' 
See gh-27050
 2021-06-24 11:21:30 +01:00
Andy Wilkinson 4572ae5430 Use reflection to extract Netty's default level 
See gh-27046
 2021-06-24 11:20:56 +01:00
Andy Wilkinson 9b91c18163 Merge branch '2.5.x' 
See gh-27073
 2021-06-24 09:53:20 +01:00
Andy Wilkinson e2d68aa8b2 Merge branch '2.4.x' into 2.5.x 
See gh-27072
 2021-06-24 09:53:04 +01:00
Andy Wilkinson a7872f47da Minimize Instantiator's public API 
See gh-27043
 2021-06-24 09:27:08 +01:00
Phillip Webb 6686a49b1f Merge branch '2.5.x' 
Closes gh-27074
 2021-06-24 00:04:44 -07:00
Phillip Webb b093db104c Pass ResourceLoader.getClassLoader() to Instantiator 
Update calls to `Instantiator` to that they also include
`ResourceLoader.getClassLoader()`.

Closes gh-27071
 2021-06-24 00:03:16 -07:00
Phillip Webb fe34bcdd52 Merge branch '2.5.x' 
Closes gh-27073
 2021-06-23 23:33:18 -07:00
Phillip Webb 641dfbdf98 Merge branch '2.4.x' into 2.5.x 
Fixes gh-27072
 2021-06-23 23:32:50 -07:00
Phillip Webb 5088927f80 Pass ClassLoader to Instantiator 
Update `Instantiator` so that it can accept a `ClassLoader` when
creating instances and rework `EnvironmentPostProcessorsFactory` to
use the new methods.

Prior to this commit we would use the `ClassLoader` to get the class
names from `SpringFactories` but not when actually creating the
instances.

Fixes gh-27043
 2021-06-23 23:30:53 -07:00
Stephane Nicoll 7d8e7468bf Merge branch '2.5.x' 
See gh-27065
 2021-06-24 08:22:02 +02:00
Stephane Nicoll d079db1dce Polish 
See gh-26978
 2021-06-24 08:20:11 +02:00
Stephane Nicoll 57f5030397 Upgrade to Netty tcNative 2.0.40.Final 
Closes gh-27070
 2021-06-24 07:49:33 +02:00
Stephane Nicoll 43f6393e9a Upgrade to Hazelcast 4.1.4 
Closes gh-27069
 2021-06-24 07:49:32 +02:00
Stephane Nicoll 6889d2adda Upgrade to Nimbus JOSE JWT 8.22 
Closes gh-27068
 2021-06-24 07:27:08 +02:00
Stephane Nicoll d4039648c7 Upgrade to OAuth2 OIDC SDK 8.36.2 
Closes gh-27067
 2021-06-24 07:27:06 +02:00
Stephane Nicoll 1f53e93b8d Upgrade to Netty tcNative 2.0.40.Final 
Closes gh-27066
 2021-06-24 07:27:05 +02:00
Stephane Nicoll d4fa46f1b9 Polish startup endpoint description in reference doc 
Closes gh-26978
 2021-06-24 07:19:58 +02:00
Stephane Nicoll 32d6b52980 Upgrade to Spring Integration 5.5.1 
Closes gh-26974
 2021-06-24 06:40:59 +02:00
Stephane Nicoll dd63f98fcf Upgrade to Spring Kafka 2.7.3 
Closes gh-26973
 2021-06-24 06:40:34 +02:00
Stephane Nicoll b5cdc84273 Upgrade to Spring AMQP 2.3.9 
Closes gh-26972
 2021-06-24 06:40:03 +02:00
Stephane Nicoll 006995fef7 Upgrade to Spring Integration 5.4.8 
Closes gh-26967
 2021-06-24 06:39:11 +02:00
Stephane Nicoll 6804ae849d Upgrade to Spring AMQP 2.3.9 
Closes gh-26966
 2021-06-24 06:38:42 +02:00
Phillip Webb cb3a41c4db Merge branch '2.5.x' 
Closes gh-27064
 2021-06-23 21:36:28 -07:00
dreis2211 7a25e4edb8 Avoid illegal reflective access in CLI tests 
See gh-26930
 2021-06-23 21:34:54 -07:00
Phillip Webb 6b241d04c0 Merge branch '2.5.x' 
Closes gh-27063
 2021-06-23 21:13:18 -07:00
Phillip Webb 093e7f7e3b Merge branch '2.4.x' into 2.5.x 
Closes gh-27062
 2021-06-23 21:13:08 -07:00
Phillip Webb 1a7569056b Fix 'spring.datasource.name' property description 
Closes gh-27026
 2021-06-23 21:12:59 -07:00
Phillip Webb 6102f10639 Merge branch '2.5.x' 2021-06-23 21:02:36 -07:00
Phillip Webb 2c518f1dff Merge branch '2.4.x' into 2.5.x 2021-06-23 21:02:05 -07:00
Phillip Webb a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Phillip Webb b141fcf51d Merge branch '2.5.x' 
Closes gh-27061
 2021-06-23 21:01:05 -07:00
Phillip Webb 84fab65b9a Merge branch '2.4.x' into 2.5.x 
Closes gh-27060
 2021-06-23 21:00:46 -07:00
Phillip Webb ea62967ef4 Improve "reason" message in BindFailureAnalyzer 
Update `BindFailureAnalyzer` so that the "Reason" message includes
the root cause exception type and message.

Closes gh-27028
 2021-06-23 20:54:01 -07:00
Phillip Webb 0e28e24123 Rethrow ConverterNotFoundException when possible 
Update `BindConverter` to throw the first `ConversionFailedException`
rather than always throwing `ConverterNotFoundException`.

See gh-27028
 2021-06-23 20:53:35 -07:00
Phillip Webb fe95c2a80c Merge branch '2.5.x' 
Closes gh-27059
 2021-06-23 17:47:19 -07:00
Phillip Webb a77e116c03 Merge branch '2.4.x' into 2.5.x 
Closes gh-27058
 2021-06-23 17:47:08 -07:00
Phillip Webb 93d316ddd1 Add additional ConfigDataProperties tests 
Add more `isActive` tests to cover negative cases.

See gh-27017
 2021-06-23 17:46:23 -07:00