Commit Graph

15711 Commits

Author SHA1 Message Date
Andy Wilkinson 4ee260aa8c Merge branch '2.5.x' into 2.6.x
Closes gh-29454
2022-01-18 20:34:51 +00:00
Andy Wilkinson 1c6471ef60 Register AprLifecycleListener with Server not Context
Fixes gh-28814
2022-01-18 20:34:08 +00:00
Stephane Nicoll 5c9e59493d Upgrade to Spring Data 2021.2.0-M2
Closes gh-29223
2022-01-18 09:57:10 +01:00
rstoyanchev 68f4938367 Update GraphQL QBE auto-config
This change is the same as 68806bfef8
for Querydsl, but applied also to the Query By Example auto config.

Closes gh-29445
2022-01-18 09:50:31 +01:00
Andy Wilkinson e23aaba32b Merge branch '2.6.x' into 2.7.x
Closes gh-29323
2022-01-17 13:21:19 +00:00
Andy Wilkinson 27cd1c06a6 Merge branch '2.5.x' into 2.6.x
Closes gh-29322
2022-01-17 13:20:29 +00:00
Andy Wilkinson 75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE
Closes gh-29321
2022-01-17 13:05:15 +00:00
Stephane Nicoll 3bbdbd9e5f Upgrade to Spring Security 5.7.0-M1
Closes gh-29225
2022-01-17 08:47:25 +01:00
Stephane Nicoll ce6cc77ea7 Upgrade to Spring Kafka 2.8.2
Closes gh-29224
2022-01-17 08:46:43 +01:00
Stephane Nicoll 77e9047d31 Upgrade to Spring AMQP 2.4.2
Closes gh-29284
2022-01-17 08:46:16 +01:00
Stephane Nicoll a9feb923d7 Update to Spring Kafka 2.8.2
Closes gh-29319
2022-01-17 08:44:50 +01:00
Stephane Nicoll 200c05ff98 Upgrade to Spring AMQP 2.4.2
Closes gh-29318
2022-01-17 08:44:15 +01:00
Stephane Nicoll e545441f01 Upgrade to Spring Kafka 2.7.10
Closes gh-29313
2022-01-17 08:41:47 +01:00
Stephane Nicoll 2f7d62eae9 Upgrade to SLF4J 1.7.33
Closes gh-29427
2022-01-15 17:50:04 +01:00
Stephane Nicoll 781ad288b0 Upgrade to SendGrid 4.8.2
Closes gh-29426
2022-01-15 17:50:04 +01:00
Stephane Nicoll a15ff0692c Upgrade to Rabbit AMQP Client 5.14.1
Closes gh-29425
2022-01-15 17:50:04 +01:00
Stephane Nicoll 6be4146907 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29424
2022-01-15 17:50:04 +01:00
Stephane Nicoll 0cb553c0da Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29423
2022-01-15 17:50:04 +01:00
Stephane Nicoll 998c7996aa Upgrade to Netty 4.1.73.Final
Closes gh-29422
2022-01-15 17:50:03 +01:00
Stephane Nicoll 3830e7a3bb Upgrade to Neo4j Java Driver 4.4.2
Closes gh-29421
2022-01-15 17:50:03 +01:00
Stephane Nicoll 5676e796d0 Upgrade to MongoDB 4.4.1
Closes gh-29420
2022-01-15 17:50:03 +01:00
Stephane Nicoll db389d7cac Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29419
2022-01-15 17:50:03 +01:00
Stephane Nicoll da3de9684a Upgrade to Maven Compiler Plugin 3.9.0
Closes gh-29418
2022-01-15 17:50:03 +01:00
Stephane Nicoll 28ecf53762 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29417
2022-01-15 17:50:03 +01:00
Stephane Nicoll b2c92457ab Upgrade to Jedis 3.8.0
Closes gh-29416
2022-01-15 17:50:02 +01:00
Stephane Nicoll 2c403cb0e8 Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29415
2022-01-15 17:50:02 +01:00
Stephane Nicoll cf3935073f Upgrade to Byte Buddy 1.12.7
Closes gh-29414
2022-01-15 17:50:02 +01:00
Stephane Nicoll 998a74bf97 Upgrade to Build Helper Maven Plugin 3.3.0
Closes gh-29413
2022-01-15 17:50:02 +01:00
Stephane Nicoll 388b12a048 Upgrade to Spring LDAP 2.4.0-M1
Closes gh-29222
2022-01-15 17:50:02 +01:00
Stephane Nicoll 7c85d2bc07 Upgrade to Spring HATEOAS 1.5.0-M1
Closes gh-29353
2022-01-15 15:07:27 +01:00
Phillip Webb a2e473ec31 Merge branch '2.6.x' into 2.7.x 2022-01-14 22:56:43 -08:00
Phillip Webb 6afd9b665d Merge branch '2.5.x' into 2.6.x 2022-01-14 22:56:30 -08:00
Phillip Webb bccc9c1861 Refine ConfigurationPropertySources attach logic
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.

See gh-29409
2022-01-14 22:55:26 -08:00
Phillip Webb e4e16f81ec Merge branch '2.6.x' into 2.7.x
Closes gh-29411
2022-01-14 20:33:19 -08:00
Phillip Webb 28cf6f5c59 Merge branch '2.5.x' into 2.6.x
Closes gh-29410
2022-01-14 20:33:05 -08:00
Phillip Webb 79d9549805 Fix ConfigurationPropertySources attach logic
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.

Fixes gh-29409
2022-01-14 20:32:34 -08:00
Phillip Webb 9c481952d8 Remove deprecated convertEnvironment method 2022-01-14 17:38:23 -08:00
Phillip Webb 9764b3eba0 Change getEnvironment() to return null by default
Update the `SpringBootContextLoader.getEnvironment()` method so that it
returns `null` rather than a new `StandardEnvironment`.

Closes gh-29405
2022-01-14 17:35:58 -08:00
Phillip Webb c84d3c14fb Allow test property sources to override command line args
Refine `SpringBootContextLoader` logic so that inline test properties
are always added above command line arguments.

Closes gh-29404
2022-01-14 16:30:28 -08:00
Phillip Webb 9278a502c7 Merge branch '2.6.x' into 2.7.x 2022-01-14 13:57:25 -08:00
Phillip Webb 14fe9347b5 Merge branch '2.5.x' into 2.6.x 2022-01-14 13:56:47 -08:00
Phillip Webb 3f7bf7d34f Modify SpringApplication Environment rather than setting it
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.

Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.

With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.

Fixes gh-29169
2022-01-14 13:47:22 -08:00
Brian Clozel cdee953252 Polish 2022-01-14 21:07:29 +01:00
Brian Clozel 68806bfef8 Fix build after Spring for GraphQL changes
See spring-projects/spring-graphql#244
2022-01-14 21:05:15 +01:00
Andy Wilkinson b67cc62c37 Merge branch '2.6.x' into 2.7.x
Closes gh-29402
2022-01-14 15:55:54 +00:00
Andy Wilkinson d29a5a2f43 Merge branch '2.5.x' into 2.6.x
Closes gh-29401
2022-01-14 15:55:41 +00:00
Andy Wilkinson e8cbec0836 Clarify documentation of RestTemplate customization
Closes gh-29394
2022-01-14 15:51:08 +00:00
Andy Wilkinson ece4c8ad93 Merge branch '2.6.x' into 2.7.x
Closes gh-29400
2022-01-14 15:49:39 +00:00
Andy Wilkinson 8868d34c24 Merge branch '2.5.x' into 2.6.x
Closes gh-29399
2022-01-14 15:48:57 +00:00
Andy Wilkinson d051146eb4 Use Testcontainers instead on Embedded Mongo
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.

Closes gh-28843
2022-01-14 15:48:31 +00:00
Stephane Nicoll 1666b1c284 Upgrade to Neo4j Java Driver 4.4.2
Closes gh-29398
2022-01-14 15:54:48 +01:00
Stephane Nicoll c2fa4ffd7e Upgrade to SLF4J 1.7.33
Closes gh-29397
2022-01-14 15:49:56 +01:00
Stephane Nicoll afcba76c3c Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29396
2022-01-14 15:49:55 +01:00
Stephane Nicoll dac4888137 Upgrade to Netty tcNative 2.0.47.Final
Closes gh-29395
2022-01-14 15:49:54 +01:00
Stephane Nicoll af79829cab Upgrade to Spring Data 2021.1.1
Closes gh-29317
2022-01-14 15:44:45 +01:00
Stephane Nicoll 1e44e4e52e Upgrade to Spring HATEOAS 1.4.1
Closes gh-29283
2022-01-14 15:44:16 +01:00
Stephane Nicoll 5883b22e01 Upgrade to SLF4J 1.7.33
Closes gh-29392
2022-01-14 12:21:04 +01:00
Stephane Nicoll 1e22504d21 Upgrade to R2DBC Bom Arabba-SR12
Closes gh-29391
2022-01-14 12:21:02 +01:00
Stephane Nicoll 251f4e8a3f Upgrade to Spring AMQP 2.3.14
Closes gh-29312
2022-01-14 12:12:00 +01:00
Stephane Nicoll 777361421c Upgrade to Spring Data 2021.0.8
Closes gh-29311
2022-01-14 12:11:30 +01:00
Stephane Nicoll 37a44f45a0 Upgrade to Spring HATEOAS 1.3.7
Closes gh-29352
2022-01-14 12:10:46 +01:00
Stephane Nicoll 77a9d0b6f1 Merge branch '2.6.x' into 2.7.x
Closes gh-29381
2022-01-13 15:31:31 +01:00
Omkar Shetkar c19e192acd Fix duplicate "Logging" link
See gh-29380
2022-01-13 15:30:21 +01:00
Stephane Nicoll d82fbcb43b Upgrade to Micrometer 1.9.0-M2
Closes gh-29282
2022-01-13 14:40:27 +01:00
Stephane Nicoll 7a0f7c498f Upgrade to Spring Framework 5.3.15
Closes gh-29328
2022-01-13 14:39:51 +01:00
Stephane Nicoll 832d8845df Upgrade to Micrometer 1.8.2
Closes gh-29316
2022-01-13 14:38:40 +01:00
Stephane Nicoll f65d766fbe Upgrade to Spring Framework 5.3.15
Closes gh-29327
2022-01-13 14:38:07 +01:00
Stephane Nicoll aa0a788800 Upgrade to Micrometer 1.7.8
Closes gh-29310
2022-01-13 14:36:51 +01:00
Stephane Nicoll 5428106925 Upgrade to Spring Framework 5.3.15
Closes gh-29326
2022-01-13 14:36:10 +01:00
Stephane Nicoll 1bf13371c4 Merge branch '2.6.x' into 2.7.x
Closes gh-29378
2022-01-13 08:45:59 +01:00
Stephane Nicoll 8384019a41 Merge branch '2.5.x' into 2.6.x
Closes gh-29377
2022-01-13 08:45:48 +01:00
Stephane Nicoll 5f03ace40f Update copyright year of changed file
See gh-29112
2022-01-13 08:43:03 +01:00
izeye 74c522c745 Polish SpringBootContextLoaderTests
See gh-29112
2022-01-13 08:42:36 +01:00
Phillip Webb 8147eb6d6d Merge branch '2.6.x' into 2.7.x 2022-01-12 15:43:44 -08:00
Phillip Webb e7fe371927 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:43:11 -08:00
Phillip Webb 27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb fee45e056a Merge branch '2.6.x' into 2.7.x
Closes gh-29375
2022-01-12 15:32:34 -08:00
Phillip Webb 91d2b1b988 Merge branch '2.5.x' into 2.6.x
Closes gh-29374
2022-01-12 15:32:00 -08:00
Phillip Webb eb6b48fff0 Use side-effect free environment with tests rather than converting
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
2022-01-12 14:21:52 -08:00
Phillip Webb e1c84e2972 Merge branch '2.6.x' into 2.7.x
Closes gh-29372
2022-01-12 14:07:48 -08:00
Phillip Webb 72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
2022-01-12 14:07:31 -08:00
Phillip Webb 9cf55808fb Ensure run user actually exists
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.

Fixes gh-29370
2022-01-12 14:05:30 -08:00
Phillip Webb ae4d9ccb2d Merge branch '2.6.x' into 2.7.x
Closes gh-29368
2022-01-12 13:54:39 -08:00
Phillip Webb 3ae7c45900 Merge branch '2.5.x' into 2.6.x
Closes gh-29367
2022-01-12 13:54:23 -08:00
Phillip Webb 827309f36f Upgrade to Testcontainers 1.16.2
Closes gh-29366
2022-01-12 13:52:43 -08:00
Stephane Nicoll ee938cf822 Upgrade to Netty 4.1.73.Final
Closes gh-29351
2022-01-12 14:33:55 +01:00
Stephane Nicoll d8739c463b Upgrade to MongoDB 4.4.1
Closes gh-29350
2022-01-12 14:33:54 +01:00
Stephane Nicoll e14c13c75f Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29349
2022-01-12 14:33:52 +01:00
Stephane Nicoll 8cdccb6cb3 Upgrade to Logback 1.2.10
Closes gh-29348
2022-01-12 14:33:51 +01:00
Stephane Nicoll 61e08e3510 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29347
2022-01-12 14:33:50 +01:00
Stephane Nicoll b19593ee47 Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29346
2022-01-12 14:33:49 +01:00
Stephane Nicoll 98118bc480 Upgrade to Jaybird 4.0.5.java8
Closes gh-29345
2022-01-12 14:33:47 +01:00
Stephane Nicoll 838cded308 Upgrade to Infinispan 12.1.11.Final
Closes gh-29344
2022-01-12 14:33:46 +01:00
Stephane Nicoll 4309b78f02 Upgrade to HttpCore5 5.1.3
Closes gh-29343
2022-01-12 14:33:45 +01:00
Stephane Nicoll ca39780ff3 Upgrade to Netty 4.1.73.Final
Closes gh-29341
2022-01-12 13:51:24 +01:00
Stephane Nicoll cb1db78c37 Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29340
2022-01-12 13:51:23 +01:00
Stephane Nicoll db9097b0d6 Upgrade to Logback 1.2.10
Closes gh-29339
2022-01-12 13:51:21 +01:00
Stephane Nicoll d23a665bdc Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29338
2022-01-12 13:51:20 +01:00
Stephane Nicoll 36811f9e1e Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29337
2022-01-12 13:51:19 +01:00
Stephane Nicoll 7125bd3779 Upgrade to Jaybird 4.0.5.java8
Closes gh-29336
2022-01-12 13:51:18 +01:00
Stephane Nicoll 404fb521ec Upgrade to Infinispan 12.1.11.Final
Closes gh-29335
2022-01-12 13:51:17 +01:00
Stephane Nicoll 33da06cff0 Upgrade to HttpCore5 5.1.3
Closes gh-29334
2022-01-12 13:51:15 +01:00
Stephane Nicoll 315fa45f46 Start building against Spring Security 5.7.0-M1 snapshots
See gh-29225
2022-01-12 13:43:22 +01:00
Stephane Nicoll be55ea9c29 Start building against Spring Framework 5.3.15 snapshots
See gh-29328
2022-01-12 09:31:04 +01:00
Stephane Nicoll c32912f05f Start building against Spring Framework 5.3.15 snapshots
See gh-29327
2022-01-12 09:30:17 +01:00
Stephane Nicoll b5407e6e8e Start building against Spring Framework 5.3.15 snapshots
See gh-29326
2022-01-12 09:29:36 +01:00
Andy Wilkinson 2a95bfed5c Start building against Spring REST Docs 2.0.6 snapshots
See gh-29323
2022-01-11 20:28:10 +00:00
Andy Wilkinson c211aa0ac2 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29322
2022-01-11 20:27:19 +00:00
Andy Wilkinson 27eaaa9442 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29321
2022-01-11 20:09:39 +00:00
Stephane Nicoll 34576f07d8 Upgrade to Reactor 2020.0.15
Closes gh-29280
2022-01-11 17:27:03 +01:00
Stephane Nicoll b9716ca4ee Start building against Spring Integration 5.5.8 snapshots
See gh-29320
2022-01-11 17:24:50 +01:00
Stephane Nicoll 504421c4a5 Start building against Spring Kafka 2.8.2 snapshots
See gh-29319
2022-01-11 17:24:49 +01:00
Stephane Nicoll ef4915ee55 Start building against Spring AMQP 2.4.2 snapshots
See gh-29318
2022-01-11 17:24:49 +01:00
Stephane Nicoll b05f435b27 Start building against Spring Data 2021.1.1 snapshots
See gh-29317
2022-01-11 17:24:49 +01:00
Stephane Nicoll 2da271a240 Start building against Micrometer 1.8.2 snapshots
See gh-29316
2022-01-11 17:24:48 +01:00
Stephane Nicoll 17b0ac61aa Upgrade to Reactor 2020.0.15
Closes gh-29315
2022-01-11 17:24:46 +01:00
Stephane Nicoll c2925f8e84 Start building against Spring Integration 5.5.8 snapshots
See gh-29314
2022-01-11 17:22:20 +01:00
Stephane Nicoll 116427c78e Start building against Spring Kafka 2.7.10 snapshots
See gh-29313
2022-01-11 17:22:20 +01:00
Stephane Nicoll 53fcf0971e Start building against Spring AMQP 2.3.14 snapshots
See gh-29312
2022-01-11 17:22:20 +01:00
Stephane Nicoll 72e72bda67 Start building against Micrometer 1.7.8 snapshots
See gh-29310
2022-01-11 17:22:19 +01:00
Stephane Nicoll 79fd0ad30a Upgrade to Reactor 2020.0.15
Closes gh-29309
2022-01-11 17:22:18 +01:00
Stephane Nicoll 1c9e7d7c8e Start building against Spring Session 2021.2.0-M1 snapshots
See gh-29226
2022-01-11 11:15:28 +01:00
Stephane Nicoll ca432309aa Polish "Add option to allow Spring Batch custom isolation levels"
See gh-28859
2022-01-11 11:07:08 +01:00
stibi a8d1d3104e Add option to allow Spring Batch custom isolation levels
See gh-28859
2022-01-11 10:39:01 +01:00
Brian Clozel fc794f17e1 Update GraphiQlHandler configuration
This commit updates the `GraphiQlHandler` auto-configuration after a
constructor change was done in Spring GraphQL for WebSocket support in
GraphiQL.
2022-01-10 18:27:50 +01:00
Stephane Nicoll e92e35d56f Polish "Stop configuring a default user with SAML 2.0 Login"
See gh-29263
2022-01-10 16:25:43 +01:00
Guirong Hu ab49acc782 Stop configuring a default user with SAML 2.0 Login
See gh-29263
2022-01-10 16:22:00 +01:00
Brian Clozel b7de02d908 Fix build after Spring GraphQL changes
See pring-projects/spring-graphql#229
2022-01-10 14:17:31 +01:00
Stephane Nicoll c02faea9c9 Allow WebMvcFilter to be overridden by user configuration
Closes gh-28428
2022-01-10 12:02:08 +01:00
Stephane Nicoll 270e162479 Stop aliasing MariaDB to MySQL
Closes gh-28728
2022-01-10 10:29:49 +01:00
Brian Clozel b17412eb38 Fix Auto-configured Spring GraphQL Tests docs
Prior to this change, the reference docs would point to "spring-webflux"
as the required additional testing dependency to get
`WebGraphQlTester` support in Spring Boot tests.

While this is enough for `WebEnvironment.MOCK` tests, we need an actual
HTTP client for `WebEnvironment.RANDOM_PORT` tests. This commit amends
this part of the documentation to recommend the
"spring-boot-starter-webflux" dependency in all cases.

Fixes gh-29250
2022-01-10 10:10:10 +01:00
Stephane Nicoll 5f67546534 Adapt to latest API change in SD Elasticsearch
See gh-29292
2022-01-09 22:24:05 +01:00
Stephane Nicoll f8aa8a9742 Remove unnecessary exclude
See gh-29292
2022-01-09 15:23:43 +01:00
Stephane Nicoll 0f93c6c475 Start building against Spring Integration 5.5.8 snapshots
See gh-29286
2022-01-09 10:23:22 +01:00
Stephane Nicoll 0412e86a4f Start building against Spring LDAP 2.4.0-M1 snapshots
See gh-29222
2022-01-09 10:08:47 +01:00
Stephane Nicoll 066bfb3635 Start building against Spring Kafka 2.8.2 snapshots
See gh-29224
2022-01-09 10:08:06 +01:00
Stephane Nicoll 6cbc0e7ac5 Start building against Spring AMQP 2.4.2 snapshots
See gh-29284
2022-01-09 10:07:39 +01:00
Stephane Nicoll 6e27448744 Start building against Micrometer 1.9.0-M2 snapshots
See gh-29282
2022-01-09 10:07:06 +01:00
Stephane Nicoll 9e27bddfc7 Start building against Spring Data 2021.2.0-M1 snapshots
This commit also upgrades to Elasticsearch 7.16.2

See gh-29223
See gh-29292
2022-01-08 19:57:50 +01:00
Stephane Nicoll 3d927a093d Start building against Spring HATEOAS 1.4.1 snapshots
See gh-29283
2022-01-08 10:56:21 +01:00
Stephane Nicoll 980aa616c8 Fix build failure
See gh-29290
2022-01-07 17:58:15 +01:00
Stephane Nicoll 7afae4aad9 Start building against Reactor 2020.0.15 snapshots
See gh-29280
2022-01-07 15:39:34 +01:00
Stephane Nicoll a9d8befe72 Fix build failures
See gh-29290
2022-01-07 15:39:33 +01:00
Andy Wilkinson 94fa50af1c Polish 2022-01-07 14:03:07 +00:00
Stephane Nicoll 9821cdfd8b Remove deprecated code
Closes gh-29290
2022-01-07 14:42:14 +01:00
Stephane Nicoll 164c2f7164 Polish
See gh-29265
2022-01-07 10:20:11 +01:00
Stephane Nicoll 69d1c3674a Upgrade to latest Hazelcast 3.x in integration tests 2022-01-06 17:41:26 +01:00
Stephane Nicoll a780e87e9c Upgrade to Hazelcast 5.0.2
See gh-29265
2022-01-06 17:38:06 +01:00
Andy Wilkinson 508d0af453 Merge branch '2.6.x' into 2.7.x
Closes gh-29269
2022-01-05 11:58:33 +00:00
Andy Wilkinson a6d8ff4677 Merge branch '2.5.x' into 2.6.x
Closes gh-29268
2022-01-05 11:58:03 +00:00