Commit Graph

18134 Commits

Author SHA1 Message Date
dreis2211 de5834d203 Polish
See gh-31845
2022-07-22 14:46:01 +01:00
Andy Wilkinson 6c28156b29 Avoid config-time creation of AOT source set's tasks
Closes gh-31844
2022-07-22 14:14:03 +01:00
Andy Wilkinson 0980362a88 Merge branch '2.7.x'
Closes gh-31843
2022-07-22 12:20:17 +01:00
Andy Wilkinson 64dcfe520d Merge branch '2.6.x' into 2.7.x
Closes gh-31842
2022-07-22 12:15:39 +01:00
Andy Wilkinson a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files
Closes gh-31575
2022-07-22 12:09:58 +01:00
Moritz Halbritter 35c49afd97 Generate hints for nested generics in configuration properties
See gh-31708
2022-07-21 16:32:40 +02:00
Olga Maciaszek-Sharma 57dc274284 Switch to Spring Framework SNAPSHOTs
Switch to Spring Framework SNAPSHOTs and adapt to updated APIs.

See gh-31834
2022-07-21 13:42:48 +01:00
Stephane Nicoll e18398236f Upgrade to Maven Install Plugin 3.0.0
Closes gh-31833
2022-07-21 08:04:30 +02:00
Stephane Nicoll a98c30866a Upgrade to Maven Deploy Plugin 3.0.0
Closes gh-31832
2022-07-21 08:04:27 +02:00
Stephane Nicoll aa93b2153a Upgrade to Embedded Mongo 3.4.7
Closes gh-31830
2022-07-21 07:50:49 +02:00
Stephane Nicoll 939481b9d7 Upgrade to Spring Batch 5.0.0-M4
Closes gh-31623
2022-07-21 07:43:45 +02:00
Stephane Nicoll dfda08fd0d Upgrade to Spring Integration 6.0.0-M4
Closes gh-31624
2022-07-21 07:43:24 +02:00
Madhura Bhave 4057dd198b Change preference of session store implementations
The order has been determined based on usage statistics.

Closes gh-27756
2022-07-20 15:36:52 -07:00
Scott Frederick 6f65777035 Merge branch '2.7.x'
Closes gh-31827
2022-07-20 17:31:37 -05:00
Scott Frederick 9da38c8d2d Merge branch '2.6.x' into 2.7.x
Closes gh-31826
2022-07-20 17:29:58 -05:00
Scott Frederick 4e0b3aad9f Clarify how docker image publishing registry is determined
Closes gh-31820
2022-07-20 17:29:40 -05:00
Scott Frederick cf7a163c6d Merge branch '2.7.x' 2022-07-20 16:07:32 -05:00
Scott Frederick f9cf31e59e Fix compile errors
See gh-28844
2022-07-20 16:07:19 -05:00
Scott Frederick 36d6106bb0 Merge branch '2.7.x'
Closes gh-31825
2022-07-20 15:11:30 -05:00
Scott Frederick 09c7ce6dab Merge branch '2.6.x' into 2.7.x
Closes gh-31824
2022-07-20 15:10:43 -05:00
Scott Frederick a7dfeae09c Merge branch 'gh-28844' into 2.6.x
Closes gh-31823
2022-07-20 15:10:27 -05:00
Scott Frederick 9b0cdac58a Simplify support for pushing images to unauthenticated registries
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.

Fixes gh-28844
2022-07-20 15:06:05 -05:00
Andy Wilkinson de672f4330 Merge branch '2.7.x'
Closes gh-31819
2022-07-20 21:02:06 +01:00
Andy Wilkinson 2e98cafcca Merge branch '2.6.x' into 2.7.x
Closes gh-31818
2022-07-20 21:01:47 +01:00
Andy Wilkinson ab2b04fafd Find health contributors in ancestor contexts in non-reactive apps
Previously, health contributors in a non-reative app were found by
retrieving them from the application context rather than via
dependency injection. This results in only contributors from the
current context being found, with contributors in ancestor contexts
ignored.

This commit moves to injection of the contributors, aligning the
behaviour with that of a reactive application.

Closes gh-27308
2022-07-20 20:52:02 +01:00
Andy Wilkinson 818e0d69a5 Merge branch '2.7.x'
Closes gh-31815
2022-07-20 19:26:42 +01:00
Andy Wilkinson cd1ce50105 Merge branch '2.6.x' into 2.7.x
Closes gh-31814
2022-07-20 19:24:38 +01:00
Andy Wilkinson 182adeed35 Add modules to dependency management for Derby
Closes gh-31570
2022-07-20 19:23:50 +01:00
Moritz Halbritter a4e84c26f0 Revert "Fix nested type discovery in ConfigurationPropertiesReflectionHintsProcessor"
This reverts commit 785588826e.
2022-07-20 18:04:13 +02:00
Brian Clozel 53b9ff5e89 Upgrade to Spring for GraphQL 1.0.1
Closes gh-31616
2022-07-20 17:37:41 +02:00
Brian Clozel 8cb2a0de94 Upgrade to GraphQL Java 18.2
Closes gh-31812
2022-07-20 17:36:45 +02:00
Andy Wilkinson 4bd82bb5af Polish "Upgrade to Flyway 9.0.1"
See gh-31723
2022-07-20 15:44:01 +01:00
Vedran Pavic f1bf80f5e1 Upgrade to Flyway 9.0.1
See gh-31723
2022-07-20 15:44:00 +01:00
Moritz Halbritter 785588826e Fix nested type discovery in ConfigurationPropertiesReflectionHintsProcessor
The old implementation picked up nested types only if they have been
annotated with NestedConfigurationProperty, which not all nested
properties are. Now the processor takes into account all referenced
types. It ignores only types in the java package and interfaces.

This commit also moves some of the tests from
ConfigurationPropertiesBeanFactoryInitializationAotProcessorTests to
ConfigurationPropertiesReflectionHintsProcessorTests for easier
discoverability

Closes gh-31708
2022-07-20 16:39:28 +02:00
Andy Wilkinson 38fedcff34 Polish "Use StackWalker to deduce main application class"
See gh-31701
2022-07-20 14:57:43 +01:00
GGGGGHT ea3fe95881 Use StackWalker to deduce main application class
See gh-31701
2022-07-20 12:37:11 +01:00
Andy Wilkinson 2814175505 Polish "Add auto-configuration for JdkClientHttpConnector"
See gh-31709
2022-07-20 12:18:50 +01:00
lihan e16734f937 Add auto-configuration for JdkClientHttpConnector
See gh-31709
2022-07-20 12:16:14 +01:00
Andy Wilkinson c3f3a2a707 Merge branch '2.6.x' into 2.7.x
Closes gh-31810
2022-07-20 11:54:01 +01:00
Andy Wilkinson efdd844c7a Log a warning if determining the app's PID takes too long
Closes gh-31572
2022-07-20 11:53:12 +01:00
Andy Wilkinson 1acc7857e6 Merge branch '2.7.x'
Closes gh-31807
2022-07-20 10:52:30 +01:00
Andy Wilkinson 84efc89d76 Merge branch '2.6.x' into 2.7.x
Closes gh-31806
2022-07-20 10:52:00 +01:00
Andy Wilkinson bcbe072d96 Fix 500 from mappings endpoint with attributed WebFlux router function
Closes gh-31784
2022-07-20 10:42:56 +01:00
Andy Wilkinson 18d3d4de5d Merge branch '2.7.x'
Closes gh-31805
2022-07-20 10:17:56 +01:00
Andy Wilkinson 10e19d504a Merge branch '2.6.x' into 2.7.x
Closes gh-31804
2022-07-20 10:17:39 +01:00
Andy Wilkinson 628c2cd0b1 Ensure JMX endpoints are uniquely named in a context hierarchy
Closes gh-31718
2022-07-20 10:15:52 +01:00
Andy Wilkinson 6da8c88b2b Include library resources on classpath of AOT source generation
Closes gh-31803
2022-07-20 10:07:02 +01:00
Stephane Nicoll c31ad5f175 Merge branch '2.7.x'
Closes gh-31802
2022-07-20 09:52:51 +02:00
Stephane Nicoll 6469a02c35 Merge branch '2.6.x' into 2.7.x
Closes gh-31801
2022-07-20 09:52:41 +02:00
Stephane Nicoll 585a57be76 Update copyright year of changed file
See gh-31798
2022-07-20 09:45:57 +02:00
aoyvx abe938eb2c Use Bean ClassLoader consistently to resolve class names
See gh-31798
2022-07-20 09:45:33 +02:00
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
Moritz Halbritter c67876f913 Add resource hints for schema and data scripts
This only registers the default locations, not the one users can provide
via 'spring.sql.init.schema-locations' and
'spring.sql.init.data-locations'.

Closes gh-31533
2022-07-20 09:15:50 +02:00
Andy Wilkinson f29eed89ca Reinstate merge of pull request #31713 from dreis2211
This reverts commit 8deef6cb42.
2022-07-19 19:57:24 +01:00
Andy Wilkinson 62ec5c19de Remove temporary workaround for deprecations in Spring Batch
TaskExecutorJobLauncher has been improved so that its inherited
methods are no longer deprecated.

See gh-31623 and b599bfe5ac
2022-07-19 17:59:58 +01:00
Andy Wilkinson 8deef6cb42 Revert "Merge pull request #31713 from dreis2211"
This reverts commit 590bfd8a5c, reversing
changes made to 993e1bf5f2.
2022-07-19 17:29:14 +01:00
Andy Wilkinson 0f7079a05a Add missing auto-config to Elasticsearch reactive repo tests
See 5c057a2730
2022-07-19 17:16:30 +01:00
Brian Clozel 7c7a32a568 Auto-configure GraphQL subscription exception handling
Closes gh-31794
2022-07-19 16:53:11 +02:00
Moritz Halbritter 5030cfedcc Revert "Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer"
This reverts commit 04391275c1.
2022-07-19 16:33:35 +02:00
Moritz Halbritter e35140d54f Add tests for SpringApplicationRuntimeHints 2022-07-19 16:29:25 +02:00
Andy Wilkinson 5c057a2730 Auto-configure the new Elasticsearch clients
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.

As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.

Closes gh-30647
Closes gh-28597
Closes gh-31755
2022-07-19 15:26:42 +01:00
Moritz Halbritter f9ccfc1e12 Register Encoding on ReflectionHints for binding
Closes gh-31528
2022-07-19 16:22:08 +02:00
Moritz Halbritter 750e0aa293 Rename ConfigurationPropertiesReflectionHintsRegistrar 2022-07-19 16:22:08 +02:00
Andy Wilkinson b599bfe5ac Temporarily work around deprecations in Spring Batch
See gh-31623
2022-07-19 15:14:34 +01:00
Moritz Halbritter 26741d8044 Register SpringApplication on ReflectionHints for binding
Closes gh-31534
2022-07-19 16:07:10 +02:00
Moritz Halbritter 55bb921a37 Extract TypeProcessor into separate class 2022-07-19 16:06:02 +02:00
Moritz Halbritter 0291388f2a Polish 2022-07-19 14:26:00 +02:00
Moritz Halbritter 13c920b2a9 Add AOT support for ReactiveHealthEndpointWebExtension
See gh-31530
2022-07-19 14:24:20 +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
Stephane Nicoll 51cba6ec72 Polish "Add AOT support for actuator"
See gh-31671
2022-07-19 13:02:49 +02:00
Moritz Halbritter 584b7d1343 Add AOT support for actuator
Mainly adds reflection hints for the actuator infrastructure.
Also adds the OperationReflectiveProcessor, which registers the
@ReadMethod, @DeleteMethod and @WriteMethod annotated methods for
reflection and adds reflection hints for method return types.

See gh-31671
2022-07-19 13:02:48 +02:00
Phillip Webb 00ec17b418 Fix checkstyle violation
See gh-31323
2022-07-19 11:51:44 +01:00
Chris Bono 8c70acc3c3 Add PropertyMapper.to(...) API designed for immutable instances
Add a new `to` method on `PropertyMapper` designed to work with
immutable instances. The new method takes an existing instance and
a mapping `BiFunction`.

See gh-31323

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2022-07-19 11:28:17 +01: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
Andy Wilkinson 1bf0ee5b1c Upgrade to Spring Security 6.0.0-M6
Closes gh-31622
2022-07-18 20:02:51 +01:00
Andy Wilkinson 8957d50e61 Upgrade to Spring Kafka 3.0.0-M5
Closes gh-31620
2022-07-18 20:00:34 +01:00
Andy Wilkinson 7fb6665774 Upgrade to Spring REST Docs 3.0.0-M4
Closes gh-31621
2022-07-18 19:57:57 +01:00
Stephane Nicoll 69570a6f26 Revert to Spring LDAP 3.0.0-M2
See gh-31618
2022-07-18 15:19:35 +02:00
Stephane Nicoll 46ddd858b8 Upgrade to Spring Data 2022.0.0-M5
Closes gh-31619
2022-07-18 15:19:13 +02:00
Stephane Nicoll e1c22bc291 Upgrade to Spring HATEOAS 2.0.0-M5
Closes gh-31683
2022-07-18 15:18:44 +02: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 501472697d Add resource hints for default templates location
Closes gh-31310
2022-07-18 15:14:21 +02:00
dreis2211 5adccb7857 Fix deprecations in javadocs
See gh-31713
2022-07-18 14:31:21 +02:00
Stephane Nicoll f5f3d7cc67 Polish "Add configuration property for RemoteIpValve's trusted proxies"
See gh-31576
2022-07-18 11:58:05 +02:00
lihan 7d6129547f Add configuration property for RemoteIpValve's trusted proxies
See gh-31576
2022-07-18 11:50:52 +02:00
Stephane Nicoll 69050a96d2 Merge branch '2.7.x'
Closes gh-31781
2022-07-18 11:49:31 +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 f52d00d9fa Merge branch '2.7.x'
Closes gh-31779
2022-07-18 11:30:45 +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 31dcd49f25 Use Spring REST Docs' bom
Closes gh-31621
2022-07-15 17:25:18 +01:00
Stephane Nicoll a27321c248 Upgrade to OpenTelemetry 1.16.0
Closes gh-31766
2022-07-15 12:12:22 +02:00
Stephane Nicoll 7e3d5331b2 Upgrade to Netty 4.1.79.Final
Closes gh-31765
2022-07-15 12:12:21 +02:00
Stephane Nicoll 2909cc2be8 Upgrade to Neo4j Java Driver 4.4.9
Closes gh-31764
2022-07-15 12:12:21 +02:00
Stephane Nicoll 23887e8460 Upgrade to MongoDB 4.7.0-beta0
Closes gh-31763
2022-07-15 12:12:21 +02:00
Stephane Nicoll 785a8491b8 Upgrade to Liquibase 4.13.0
Closes gh-31762
2022-07-15 12:12:21 +02:00
Stephane Nicoll 92b8bcbdac Upgrade to Lettuce 6.2.0.RELEASE
Closes gh-31761
2022-07-15 12:12:21 +02:00
Stephane Nicoll 5ac431bf0e Upgrade to Kotlin Coroutines 1.6.4
Closes gh-31760
2022-07-15 11:39:41 +02:00
Stephane Nicoll 3e3971d78c Upgrade to HttpCore5 5.1.4
Closes gh-31759
2022-07-15 11:39:38 +02:00
Stephane Nicoll 23804540ce Upgrade to HtmlUnit 2.63.0
Closes gh-31758
2022-07-15 11:39:35 +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 7bd9873cd9 Raise the minimum supported version of Gradle to 7.5
Closes gh-31215
2022-07-14 15:56:32 +01:00
Andy Wilkinson ccbd62fd82 Merge branch '2.7.x'
Closes gh-31733
2022-07-14 15:48:51 +01: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 35aa6b0ff6 Upgrade to Spring Framework 6.0.0-M5
Closes gh-31241
2022-07-14 16:11:49 +02: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
Andy Wilkinson 3405a54f9e Exclude Jetty toolchain dependencies in favor of official API artifacts
Closes gh-31720
2022-07-14 13:55:26 +01:00
Madhura Bhave 7c56a45d3e Drop support for String path matching for MVC endpoints
Closes gh-31700
2022-07-13 14:03:32 -07:00
Jonas 6afd041bb2 Fix typo
See gh-31518
2022-07-13 16:18:53 +02:00
Stephane Nicoll 4ae4698093 Polish "Add config property for KafkaAdmin modifyTopicConfigs"
See gh-31679
2022-07-13 16:10:35 +02:00
Michael Kreis 677c05a5b1 Add config property for KafkaAdmin modifyTopicConfigs
See gh-31679
2022-07-13 16:01:33 +02:00
Stephane Nicoll 8e3aaf1cf4 Merge branch '2.7.x'
Closes gh-31707
2022-07-13 14:12:28 +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 9cace34a19 Merge branch '2.7.x'
Closes gh-31705
2022-07-13 13:50: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