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

17150 Commits

Author SHA1 Message Date
Stephane Nicoll b9cf951423 Upgrade to Spring Integration 5.5.14 
Closes gh-31800
 2022-07-20 09:16:59 +02:00
Stephane Nicoll ac65835103 Upgrade to Spring Integration 5.5.14 
Closes gh-31799
 2022-07-20 09:16:17 +02:00
Brian Clozel 7c7a32a568 Auto-configure GraphQL subscription exception handling 
Closes gh-31794
 2022-07-19 16:53:11 +02:00
Stephane Nicoll a62ea1e3b8 Upgrade to AppEngine SDK 1.9.98 
Closes gh-31790
 2022-07-19 14:14:05 +02:00
Stephane Nicoll 4449f41cf5 Upgrade to Kotlin Coroutines 1.6.4 
Closes gh-31742
 2022-07-19 14:12:20 +02:00
Stephane Nicoll e48f5de20f Upgrade to AppEngine SDK 1.9.98 
Closes gh-31788
 2022-07-19 14:09:31 +02:00
Andy Wilkinson 4278683f26 Upgrade to Spring Kafka 2.8.8 
Closes gh-31786
 2022-07-18 20:12:04 +01:00
Andy Wilkinson a326a1291e Upgrade to Spring Kafka 2.8.8 
Closes gh-31785
 2022-07-18 20:10:36 +01:00
Stephane Nicoll 503656000d Upgrade to Spring Data 2021.1.6 
Closes gh-31611
 2022-07-18 15:17:46 +02:00
Stephane Nicoll e25d3d6a03 Upgrade to Spring Data 2021.1.6 
Closes gh-31611
 2022-07-18 15:17:02 +02:00
Stephane Nicoll 52d4dd9347 Merge branch '2.6.x' into 2.7.x 
Closes gh-31780
 2022-07-18 11:49:22 +02:00
Stephane Nicoll 4eb5037828 Update copyright year of changed files 
See gh-31571
 2022-07-18 11:48:35 +02:00
TheoCaldas 869ed4f71a Delimit output value in failure analysis 
See gh-31571
 2022-07-18 11:36:39 +02:00
Stephane Nicoll 92a7af4038 Merge branch '2.6.x' into 2.7.x 
Closes gh-31777
 2022-07-18 11:30:36 +02:00
Johnny Lim f591c75ad7 Disable incompatible tests on macOS AArch64 
This commit also updates related test support classes.

See gh-31539
 2022-07-18 11:25:52 +02:00
Andy Wilkinson 9c250cae92 Merge branch '2.6.x' into 2.7.x 
Closes gh-31754
 2022-07-14 17:28:54 +01:00
Stephane Nicoll 186f93c3cb Revert "Upgrade to Elasticsearch 7.17.5" 
This reverts commit ac4c3d2b81.

See gh-31737
 2022-07-14 18:26:48 +02:00
Andy Wilkinson 8c4708982b Test our Gradle plugin against 7.5 
Closes gh-31753
 2022-07-14 17:25:34 +01:00
Stephane Nicoll b603138248 Upgrade to SendGrid 4.9.3 
Closes gh-31747
 2022-07-14 18:25:34 +02:00
Stephane Nicoll 59a394c5a5 Upgrade to Netty 4.1.79.Final 
Closes gh-31746
 2022-07-14 18:25:34 +02:00
Stephane Nicoll 37e0ea5142 Upgrade to Neo4j Java Driver 4.4.9 
Closes gh-31745
 2022-07-14 18:25:34 +02:00
Stephane Nicoll 5f65301cbc Upgrade to MariaDB 3.0.6 
Closes gh-31744
 2022-07-14 18:25:34 +02:00
Stephane Nicoll 90ac0e87ee Upgrade to Lettuce 6.1.9.RELEASE 
Closes gh-31743
 2022-07-14 18:25:33 +02:00
Stephane Nicoll 38e90497ac Upgrade to Kotlin Coroutines 1.6.3-native-mt 
Closes gh-31742
 2022-07-14 18:25:33 +02:00
Stephane Nicoll 611514ae89 Upgrade to JsonAssert 1.5.1 
Closes gh-31741
 2022-07-14 18:25:33 +02:00
Stephane Nicoll 191509292b Upgrade to Jetty Reactive HTTPClient 1.1.12 
Closes gh-31740
 2022-07-14 18:25:33 +02:00
Stephane Nicoll 1a4d0b2d9c Upgrade to HttpCore5 5.1.4 
Closes gh-31739
 2022-07-14 18:25:33 +02:00
Stephane Nicoll 689dae1b14 Upgrade to Hibernate 5.6.10.Final 
Closes gh-31738
 2022-07-14 18:25:32 +02:00
Stephane Nicoll ac4c3d2b81 Upgrade to Elasticsearch 7.17.5 
Closes gh-31737
 2022-07-14 18:25:32 +02:00
Stephane Nicoll 01fbdac192 Upgrade to Couchbase Client 3.3.2 
Closes gh-31736
 2022-07-14 18:25:32 +02:00
Stephane Nicoll 30a10164a8 Upgrade to Byte Buddy 1.12.12 
Closes gh-31735
 2022-07-14 18:25:32 +02:00
Stephane Nicoll 8a58fc438f Upgrade to Netty 4.1.79.Final 
Closes gh-31731
 2022-07-14 17:02:48 +02:00
Stephane Nicoll 99ad445229 Upgrade to Neo4j Java Driver 4.4.9 
Closes gh-31730
 2022-07-14 17:02:48 +02:00
Stephane Nicoll 877fffc02b Upgrade to MariaDB 2.7.6 
Closes gh-31729
 2022-07-14 17:02:47 +02:00
Stephane Nicoll e99d53bfeb Upgrade to Lettuce 6.1.9.RELEASE 
Closes gh-31728
 2022-07-14 17:02:47 +02:00
Stephane Nicoll 6181db3f20 Upgrade to JsonAssert 1.5.1 
Closes gh-31727
 2022-07-14 17:02:47 +02:00
Stephane Nicoll 38713f2586 Upgrade to Jetty Reactive HTTPClient 1.1.12 
Closes gh-31726
 2022-07-14 17:02:46 +02:00
Stephane Nicoll 02bf666f88 Upgrade to HttpCore5 5.1.4 
Closes gh-31725
 2022-07-14 17:02:46 +02:00
Stephane Nicoll 6b54aefe3e Upgrade to Hibernate 5.6.10.Final 
Closes gh-31724
 2022-07-14 17:02:46 +02:00
Andy Wilkinson b6b4b3b5b6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31732
 2022-07-14 15:39:15 +01:00
Andy Wilkinson 9443713c53 Disable Log4j2's shutdown hook with 2.18 and later 
Closes gh-31719
 2022-07-14 15:38:19 +01:00
Stephane Nicoll 585a7ca71f Upgrade to Spring Framework 5.3.22 
Closes gh-31613
 2022-07-14 16:10:37 +02:00
Stephane Nicoll 77194eed29 Upgrade to Spring Framework 5.3.22 
Closes gh-31610
 2022-07-14 16:09:35 +02:00
Jonas 6afd041bb2 Fix typo 
See gh-31518
 2022-07-13 16:18:53 +02:00
Stephane Nicoll 3e4a5703c6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31706
 2022-07-13 14:11:44 +02:00
Stephane Nicoll 628a7b0c5c Update copyright year of changed files 
See gh-31516
 2022-07-13 14:08:22 +02:00
“Jakub ed7b333138 Add missing descriptions for HTTP Server and Data repositories metrics 
See gh-31516
 2022-07-13 13:55:36 +02:00
Stephane Nicoll b8647551cb Merge branch '2.6.x' into 2.7.x 
Closes gh-31704
 2022-07-13 13:50:17 +02:00
Johnny Lim b17cb9b92b Polish gh-31231 
See gh-31540
 2022-07-13 13:49:13 +02:00
Andy Wilkinson 1664ce0f20 Uses tabs consistently for indentation in spring-boot-dependencies 2022-07-12 15:47:54 +01:00
Andy Wilkinson 1c2b0ae705 Merge branch '2.6.x' into 2.7.x 
Closes gh-31693
 2022-07-12 14:28:10 +01:00
Andy Wilkinson 7c55639167 Depend on log4j-api directly rather than via Elastic's transitives 
Closes gh-31692
 2022-07-12 14:27:56 +01:00
Stephane Nicoll cb2844d527 Merge branch '2.6.x' into 2.7.x 
Closes gh-31690
 2022-07-12 14:51:33 +02:00
Stephane Nicoll a368919600 Polish "Fix deprecation metadata for grid-fs-database" 
See gh-31689
 2022-07-12 14:42:49 +02:00
Felix Scheinost d5e18e61c5 Fix deprecation metadata for grid-fs-database 
See gh-31689
 2022-07-12 14:42:36 +02:00
Stephane Nicoll c7d8323158 Upgrade to Reactor 2020.0.21 
Closes gh-31608
 2022-07-12 14:34:21 +02:00
Stephane Nicoll 793586f898 Upgrade to Reactor 2020.0.21 
Closes gh-31607
 2022-07-12 14:33:38 +02:00
Andy Wilkinson eb13f80ff4 Upgrade to Micrometer 1.9.2 
Closes gh-31614
 2022-07-11 21:05:47 +01:00
Andy Wilkinson fe19984147 Upgrade to Micrometer 1.8.8 
Closes gh-31612
 2022-07-11 21:04:15 +01:00
Andy Wilkinson c6d5652dcc Start building against Spring GraphQL 1.0.1 snapshots 
See gh-31616
 2022-07-08 09:58:24 +01:00
Andy Wilkinson 28b4938c9b Startin building against Spring Data 2021.2.2 snapshots 
See gh-31615
 2022-07-08 09:57:38 +01:00
Andy Wilkinson 2c74a9376a Start building against Micrometer 1.9.2 snapshots 
See gh-31614
 2022-07-08 09:56:52 +01:00
Andy Wilkinson 292d351b16 Start building against Reactor 2020.0.21 snapshots 
See gh-31608
 2022-07-08 09:55:52 +01:00
Andy Wilkinson 55aa17eb11 Start building against Spring Framework 5.3.22 snapshots 
See gh-31613
 2022-07-08 09:55:15 +01:00
Andy Wilkinson b94527de3b Start building against Micrometer 1.8.8 snapshots 
See gh-31612
 2022-07-07 17:04:02 +01:00
Andy Wilkinson f417b4b9b2 Start building against Spring Data 2021.1.6 snapshots 
See gh-31611
 2022-07-07 17:04:02 +01:00
Andy Wilkinson ece51636fd Start building against Spring Framework 5.3.22 snapshots 
See gh-31610
 2022-07-07 17:04:01 +01:00
Andy Wilkinson c38a3c0da4 Start building against Reactor 2020.0.21 snapshots 
See gh-31607
 2022-07-07 16:37:55 +01:00
Moritz Halbritter d4b1c219ab Move test imports from main to test resources 
They shouldn't have been in main resources in the first place, this was
an accident.
 2022-07-07 15:15:34 +02:00
Scott Frederick e24c49a09a Merge branch '2.6.x' into 2.7.x 
Closes gh-31558
 2022-06-30 14:58:28 -05:00
Scott Frederick 17bdc526f6 Avoid adding layers for buildpacks that exist in the builder 
This commit adds validation of any buildpacks that are specified for
image building to match them against buildpacks that are bundled in
the builder. If an image buildpack's ID, version, and one layer
hash match the same information stored in a label on the builder
image, that buildpack won't be added and the buildpack bundled in
the builder will be used instead. This reduces the chance of adding to
the total count of layers in a builder image unnecessarily.

Fixes gh-31233
 2022-06-30 14:35:34 -05:00
Andy Wilkinson 5299e849b9 Merge branch '2.6.x' into 2.7.x 
Closes gh-31556
 2022-06-30 20:11:28 +01:00
Andy Wilkinson 6411f88f28 Upgrade to Dependency Management Plugin 1.0.12.RELEASE 
Closes gh-31555
 2022-06-30 19:45:40 +01:00
Andy Wilkinson 2f01739e0d Polish since date on new SslStoreProvider API 
See gh-31253
 2022-06-26 08:18:21 +01:00
Andy Wilkinson 71526bf44f Polish 
See gh-31253
 2022-06-25 13:47:25 +01:00
Andy Wilkinson 7abc7df7b8 Allow PEM certificates to be used without a key store password 
Closes gh-31253
 2022-06-24 18:01:20 +01:00
Andy Wilkinson dfb8979456 Merge branch '2.6.x' into 2.7.x 2022-06-24 15:03:25 +01:00
Andy Wilkinson c87340e5c1 Remove unnecessary throws 2022-06-24 15:02:58 +01:00
Andy Wilkinson 1e08f545d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31525
 2022-06-24 13:05:06 +01:00
Andy Wilkinson f49b16c645 Upgrade to Spring Java Format 0.0.34 
Closes gh-31524
 2022-06-24 12:57:52 +01:00
Stephane Nicoll a94e7d6672 Upgrade to Jetty 9.4.48.v20220622 
Closes gh-31509
 2022-06-23 08:41:23 +02:00
Stephane Nicoll 5976457271 Upgrade to Byte Buddy 1.12.11 
Closes gh-31508
 2022-06-23 08:41:19 +02:00
Stephane Nicoll 6484be2aa5 Upgrade to Jetty 9.4.48.v20220622 
Closes gh-31507
 2022-06-23 08:37:51 +02:00
Phillip Webb 28775c2c53 Merge branch '2.6.x' into 2.7.x 
Closes gh-31503
 2022-06-22 20:31:58 -07:00
Phillip Webb 904feb2490 Polish 'Allow spring.data.cassandra.config file to override default values' 
See gh-31238
 2022-06-22 19:51:32 -07:00
Stern, Ittay (is9613) 1c7d99890e Allow spring.data.cassandra.config file to override default values 
Update `CassandraAutoConfiguration` so that properties in a
`spring.data.cassandra.config` file can override the default values
defined in `CassandraProperties`.

This commit changes two things:

1. Any primitive on `CassandraProperties` are replaced with object values.
   This allows distinguishing between defaults values and no-values. Then
   CassandraAutoConfiguration.mapConfig() can use whenNonNull() predicate
   to ignore those.

2. `CassandraProperties` no longer populate default values on any
   property. With that, the defaults can be applied on top of the file
   spring.data.cassandra.config; i.e. the config file have higher
   precedence than the defaults, but lower that any spring.data.cassandra.*
   property.

See gh-31238
 2022-06-22 19:27:40 -07:00
Phillip Webb d64f601dfd Merge branch '2.6.x' into 2.7.x 
Closes gh-31501
 2022-06-22 16:31:52 -07:00
Phillip Webb aed4c47adb Polish CompositeHandlerExceptionResolver 
See gh-31495
 2022-06-22 16:23:38 -07:00
Guirong Hu 3592292e4b Use ExceptionHandler when Spring MVC uses a different management port 
Update `CompositeHandlerExceptionResolver` to search for beans in
all contexts. Note that `BeanFactoryUtils.beansOfTypeIncludingAncestors`
cannot not be used since we need to pick up all beans, even if they
have the same name.

See gh-31495
 2022-06-22 16:13:26 -07:00
Andy Wilkinson a784156f66 Revert "Start building against Spring Session 2021.1.4 snapshots" 
This reverts commit 2f40c52d81.
 2022-06-22 21:13:18 +01:00
Andy Wilkinson 83932cfe94 Merge branch '2.6.x' into 2.7.x 
Closes gh-31483
 2022-06-22 20:54:56 +01:00
Andy Wilkinson 17c757c600 Upgrade to Spring Integration 5.5.13 
Closes gh-31482
 2022-06-22 20:38:19 +01:00
Andy Wilkinson 268f13dbd7 Merge branch '2.6.x' into 2.7.x 
Closes gh-31499
 2022-06-22 19:49:38 +01:00
Andy Wilkinson 522ea0a90e Handle malformed JSON more consistently 
Closes gh-31301
 2022-06-22 18:31:16 +01:00
Stephane Nicoll e967d0383b Merge branch '2.6.x' into 2.7.x 2022-06-22 08:16:18 +02:00
Stephane Nicoll 79d3e3080f Polish 2022-06-22 08:15:04 +02:00
Stephane Nicoll f27adeb241 Upgrade to Solr 8.11.2 
Closes gh-31491
 2022-06-22 08:03:53 +02:00
Stephane Nicoll 4f6bc3c2e0 Upgrade to Kotlin Coroutines 1.6.3 
Closes gh-31490
 2022-06-22 08:03:51 +02:00
Stephane Nicoll 7266dd5270 Upgrade to Jetty 9.4.47.v20220610 
Closes gh-31489
 2022-06-22 08:03:47 +02:00
Stephane Nicoll 296e88db51 Upgrade to Dropwizard Metrics 4.2.10 
Closes gh-31488
 2022-06-22 08:03:45 +02:00
Stephane Nicoll 72257ba302 Upgrade to Jetty 9.4.47.v20220610 
Closes gh-31487
 2022-06-22 07:55:16 +02:00
Stephane Nicoll e74163704c Upgrade to Dropwizard Metrics 4.2.10 
Closes gh-31486
 2022-06-22 07:55:14 +02:00
Stephane Nicoll 1c2e3b731b Upgrade to Spring Kafka 2.8.7 
Closes gh-31377
 2022-06-22 07:52:14 +02:00
Stephane Nicoll 09cd024817 Upgrade to Spring Kafka 2.8.7 
Closes gh-31350
 2022-06-22 07:51:32 +02:00
Phillip Webb 13b2de3bb8 Merge branch '2.6.x' into 2.7.x 
Closes gh-31484
 2022-06-21 19:10:23 -07:00
Phillip Webb 7fc9debf2a Consider super classes when detecting nested property classes 
Update `PropertyDescriptor.isParentTheSame` to consider the candidate
as well as all super classes.

Fixes gh-21626
 2022-06-21 19:09:32 -07:00
Phillip Webb 4c0a4cb669 Polish 2022-06-21 12:08:03 -07:00
Andy Wilkinson 390554a84f Upgrade to Spring AMQP 2.4.6 
Closes gh-31376
 2022-06-21 16:36:55 +01:00
Andy Wilkinson 49fd727ef0 Upgrade to Spring AMQP 2.4.6 
Closes gh-31348
 2022-06-21 16:34:47 +01:00
Moritz Halbritter ae75d4386c Merge branch '2.6.x' into 2.7.x 2022-06-21 14:01:18 +02:00
Moritz Halbritter b56b95d429 Add Apache HttpClient WebClient support to documentation 2022-06-21 14:00:55 +02:00
Andy Wilkinson d45e42f2e1 Upgrade to Spring Security 5.6.6 
Closes gh-31351
 2022-06-20 20:46:38 +01:00
Andy Wilkinson 79580617a6 Upgrade to Spring Security 5.7.2 
Closes gh-31375
 2022-06-20 20:33:56 +01:00
Sébastien Deleuze b5d380c1cb Make SpringApplication Kotlin samples idiomatic 
See gh-31463
 2022-06-20 14:38:43 +02:00
Stephane Nicoll c04b407913 Upgrade to Spring Data 2021.2.1 
Closes gh-31374
 2022-06-20 14:22:25 +02:00
Stephane Nicoll 4f78f9556d Upgrade to Spring HATEOAS 1.5.1 
Closes gh-31465
 2022-06-20 14:21:48 +02:00
Stephane Nicoll 46a5e5d9d4 Upgrade to Spring Data 2021.1.5 
Closes gh-31349
 2022-06-20 14:19:53 +02:00
Stephane Nicoll 87ecbc7073 Upgrade to Spring HATEOAS 1.4.4 
Closes gh-31464
 2022-06-20 14:19:17 +02:00
Stephane Nicoll 8b9579eeb7 Polish "Harmonize Kotlin example" 
See gh-31458
 2022-06-20 10:33:34 +02:00
ningenMe 6685d49faa Harmonize Kotlin example 
See gh-31458
 2022-06-20 10:27:04 +02:00
Johnny Lim 11a07a9d1e Polish OAuth2ResourceServerAutoConfigurationTests 
See gh-31453
 2022-06-19 10:11:48 +02:00
Stephane Nicoll 3366e4de25 Upgrade to Spring LDAP 2.4.1 
Closes gh-31373
 2022-06-17 11:00:10 +02:00
Stephane Nicoll c61fab2777 Upgrade to Undertow 2.2.18.Final 
Closes gh-31438
 2022-06-17 10:59:47 +02:00
Stephane Nicoll 4f95fdea82 Upgrade to Reactive Streams 1.0.4 
Closes gh-31436
 2022-06-17 10:59:42 +02:00
Stephane Nicoll 91d9d48446 Upgrade to Postgresql 42.3.6 
Closes gh-31435
 2022-06-17 10:59:40 +02:00
Stephane Nicoll 548e8728e4 Upgrade to Netty 4.1.78.Final 
Closes gh-31434
 2022-06-17 10:59:38 +02:00
Stephane Nicoll e43e9c3c40 Upgrade to Neo4j Java Driver 4.4.6 
Closes gh-31433
 2022-06-17 10:59:35 +02:00
Stephane Nicoll 8e911affad Upgrade to MongoDB 4.6.1 
Closes gh-31432
 2022-06-17 10:59:33 +02:00
Stephane Nicoll c93d3201ff Upgrade to MariaDB 3.0.5 
Closes gh-31431
 2022-06-17 10:59:31 +02:00
Stephane Nicoll 338d8d997b Upgrade to Kotlin Coroutines 1.6.2 
Closes gh-31430
 2022-06-17 10:59:29 +02:00
Stephane Nicoll dbf3677c0a Upgrade to jOOQ 3.14.16 
Closes gh-31429
 2022-06-17 10:59:26 +02:00
Stephane Nicoll 26b64e7713 Upgrade to Hazelcast 5.1.2 
Closes gh-31428
 2022-06-17 10:59:24 +02:00
Stephane Nicoll 670876b52d Upgrade to H2 2.1.214 
Closes gh-31427
 2022-06-17 10:59:22 +02:00
Stephane Nicoll cd2a8a91da Upgrade to Groovy 3.0.11 
Closes gh-31426
 2022-06-17 10:59:19 +02:00
Stephane Nicoll 4d03653b74 Upgrade to Flyway 8.5.13 
Closes gh-31425
 2022-06-17 10:59:16 +02:00
Stephane Nicoll e60a235194 Upgrade to Embedded Mongo 3.4.6 
Closes gh-31424
 2022-06-17 10:59:14 +02:00
Stephane Nicoll 54e4ff8e81 Upgrade to Elasticsearch 7.17.4 
Closes gh-31423
 2022-06-17 10:59:12 +02:00
Stephane Nicoll 9590a9914a Upgrade to Couchbase Client 3.3.1 
Closes gh-31422
 2022-06-17 10:59:10 +02:00
Stephane Nicoll d82c6dc291 Upgrade to AppEngine SDK 1.9.97 
Closes gh-31421
 2022-06-17 10:59:07 +02:00
Stephane Nicoll 8548f1a1cb Upgrade to Undertow 2.2.18.Final 
Closes gh-31420
 2022-06-17 10:30:34 +02:00
Stephane Nicoll 0edf12c07c Upgrade to Reactive Streams 1.0.4 
Closes gh-31418
 2022-06-17 10:30:30 +02:00
Stephane Nicoll 898cf7665a Upgrade to Postgresql 42.3.6 
Closes gh-31417
 2022-06-17 10:30:28 +02:00
Stephane Nicoll 854578c936 Upgrade to Netty tcNative 2.0.53.Final 
Closes gh-31416
 2022-06-17 10:30:25 +02:00
Stephane Nicoll 9076e38f06 Upgrade to Netty 4.1.78.Final 
Closes gh-31415
 2022-06-17 10:30:23 +02:00
Stephane Nicoll 71e5b90948 Upgrade to Neo4j Java Driver 4.4.6 
Closes gh-31414
 2022-06-17 10:30:21 +02:00
Stephane Nicoll 3b20c67f02 Upgrade to jOOQ 3.14.16 
Closes gh-31413
 2022-06-17 10:30:19 +02:00
Stephane Nicoll 78d0db7ff0 Upgrade to Infinispan 12.1.12.Final 
Closes gh-31412
 2022-06-17 10:30:16 +02:00
Stephane Nicoll 623a48fb03 Upgrade to Groovy 3.0.11 
Closes gh-31411
 2022-06-17 10:30:14 +02:00
Stephane Nicoll ae1b47c245 Upgrade to AppEngine SDK 1.9.97 
Closes gh-31410
 2022-06-17 10:30:12 +02:00
Phillip Webb 7c91ebb1b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31408
 2022-06-16 15:36:00 -07:00