Commit Graph

3114 Commits

Author SHA1 Message Date
Stephane Nicoll 83e2ffe45c Merge branch '2.7.x' 2022-01-24 09:30:05 +01:00
Stephane Nicoll ba8c76ba08 Merge branch '2.6.x' into 2.7.x
Closes gh-29538
2022-01-24 09:29:48 +01:00
Stephane Nicoll 267cd45235 Merge branch '2.5.x' into 2.6.x
Closes gh-29537
2022-01-24 09:29:31 +01:00
Janne Valkealahti d821f86b8e Upgrade reference of gradle-git-properties to 2.3.2
See gh-29535
2022-01-24 09:28:53 +01:00
Andy Wilkinson f025ab629a Switch to new coordinates for Git Commit ID Maven Plugin
Closes gh-29515
2022-01-20 17:37:03 +00:00
Andy Wilkinson 91060a94d4 Merge branch '2.7.x' 2022-01-19 13:20:37 +00:00
Andy Wilkinson 6fa4b942ee Merge branch '2.6.x' into 2.7.x
Closes gh-29481
2022-01-19 13:19:13 +00:00
Andy Wilkinson 52f612b3eb Merge branch '2.5.x' into 2.6.x
Closes gh-29480
2022-01-19 13:18:50 +00:00
Andy Wilkinson 9cb66d55d1 Refer to Maven Resolver rather than Aether
Closes gh-29255
2022-01-19 13:18:05 +00:00
Andy Wilkinson 26fecbe230 Upgrade to Thymeleaf and Security Extras 3.1.0-M1
Closes gh-49452
Closes gh-49453
2022-01-18 16:01:29 +00:00
Andy Wilkinson 12cd97a20c Reinstate support for Thymeleaf 2022-01-18 16:01:29 +00:00
Andy Wilkinson d60da1cc59 Merge branch '2.7.x' 2022-01-14 15:56:03 +00: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 15dafebe0d Polish "Avoid split java.xml packages that cause JDT compile errors"
See gh-29389
2022-01-14 12:43:16 +00:00
Dave Syer 32a6c7df49 Avoid split java.xml packages that cause JDT compile errors
Without this change I get compiler errors from JDT in the IDE
(VSCode). It seems to be harmless from the point of view of the
command line build with the JDK.

See gh-29389
2022-01-14 12:42:02 +00:00
Andy Wilkinson a79cba129f Remove faulty javadoc styling
The styling does not work with Java 17-generated javadoc. Following
Spring Framework's lead, this commit removes the custom styling.

See gh-28101
2022-01-13 15:39:34 +00:00
Stephane Nicoll 9a9cfa78c8 Merge branch '2.7.x' 2022-01-13 15:31:38 +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 90b8d2190f Adapt to latest change in Spring Data Elasticsearch 2022-01-12 10:04:44 +01:00
Stephane Nicoll 8ec8268a77 Merge branch '2.7.x' 2022-01-10 12:07:19 +01:00
Stephane Nicoll c02faea9c9 Allow WebMvcFilter to be overridden by user configuration
Closes gh-28428
2022-01-10 12:02:08 +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 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
Andy Wilkinson 894f83fb13 Upgrade to Artemis 2.20.0 and switch to Jakarta EE 9 JMS API
Closes gh-29203
2022-01-07 15:26:39 +00:00
Andy Wilkinson 89e79e826e Reinstate support for Apache Artemis
See gh-29203
2022-01-07 15:26:29 +00:00
Stephane Nicoll c62aa0deab Remove support for Hazelcast 3
Closes gh-29287
2022-01-07 10:22:27 +01:00
Stephane Nicoll 025fe4fd43 Merge branch '2.7.x' 2022-01-06 17:50:15 +01:00
Stephane Nicoll a780e87e9c Upgrade to Hazelcast 5.0.2
See gh-29265
2022-01-06 17:38:06 +01:00
Andy Wilkinson 35b32bb3ff Update Javadoc to link to Java SE 17 and Jakarta EE 9
Closes gh-29277
2022-01-06 14:39:33 +00:00
Andy Wilkinson c2e86096cd Reinstate support for jOOQ as it now supports Jakarta EE 9
Closes gh-29271
2022-01-05 15:46:54 +00:00
Phillip Webb 06398eabed Merge branch '2.7.x' 2022-01-04 12:26:24 -08:00
Andy Wilkinson 1dbfcf8b57 Reinstate support for Spring Data Couchbase
Closes gh-28976
2022-01-04 16:38:16 +00:00
Stephane Nicoll e2f274f01d Merge branch '2.7.x' 2022-01-04 15:36:12 +01:00
Stephane Nicoll 9b34c31916 Polish "Include AbstractJdbcConfiguration beans in @DataJdbcTest"
See gh-29003
2022-01-04 15:32:23 +01:00
Stephane Nicoll abb622023d Merge branch '2.7.x' 2022-01-04 14:23:48 +01:00
Stephane Nicoll d24720d958 Polish "Expose OS information as an InfoContributor"
See gh-28907
2022-01-04 14:08:24 +01:00
Jonatan Ivanov c700f686c6 Expose OS information as an InfoContributor
See gh-28907
2022-01-04 13:58:39 +01:00
Stephane Nicoll 64062adf0d Merge branch '2.7.x' 2022-01-04 09:58:24 +01:00
Stephane Nicoll e1a5be83d2 Polish "Inject SpringManagedContext into Hazelcast configuration"
See gh-28801
2022-01-04 09:57:48 +01:00
Brian Clozel c5817f21eb Add property for disabling GraphQL schema introspection
Prior to this commit, the GraphQL schema assembled by the
auto-configuration would provide no option for disabling the field
introspection.

While this feature is essential for many tools (including GraphiQL),
some prefer disabling it because this allows clients to gather
information about types and schema easily. This commit introduces a new
`spring.graphql.schema.introspection.enabled` configuration property.

Because potential attackers can still gather this information and this
feature is a core concern in the GraphQL spec, introspection is enabled
by default for Spring Boot applications.

Closes gh-29248
2022-01-03 17:36:58 +01:00
izeye 728206dba0 Polish GraphQL changes
See gh-29140
Closes gh-29194
2022-01-03 17:36:57 +01:00
Stephane Nicoll 5864c300e0 Merge branch '2.7.x' 2022-01-03 14:11:47 +01:00
Stephane Nicoll 6b6da22f2c Polish "Add support for RabbitStreamTemplate"
See gh-28060
2022-01-03 14:02:27 +01:00
Stephane Nicoll 3ef03cddb9 Merge branch '2.7.x' 2022-01-02 11:26:04 +01:00
Stephane Nicoll 9c868751d6 Merge branch '2.6.x' into 2.7.x
Closes gh-29199
2022-01-02 11:25:56 +01:00
Stephane Nicoll f54ea67ed6 Merge branch '2.5.x' into 2.6.x
Closes gh-29198
2022-01-02 11:25:46 +01:00
dreis2211 7a87d18b12 Update copyrights to 2022
See gh-29195
2022-01-02 11:24:58 +01:00
Stephane Nicoll 09486b8fc7 Merge branch '2.7.x' 2021-12-27 12:03:11 +01:00
Stephane Nicoll 2b140950e3 Merge branch '2.6.x' into 2.7.x
Closes gh-29176
2021-12-27 12:02:57 +01:00
izeye 7fbb5749d1 Polish
See gh-29157
2021-12-27 12:01:50 +01:00
Brian Clozel f61c87c3a7 Revert "Merge branch '2.7.x'"
This reverts commit f0677a119c, reversing
changes made to 938d58f32c.
2021-12-21 09:05:06 +01:00
Brian Clozel f0677a119c Merge branch '2.7.x' 2021-12-21 09:04:10 +01:00
Brian Clozel 22706057f0 Document Spring GraphQL support
This commit documents all the features added in the previous commits:
from the main infrastructure support, to testing and metrics.

See gh-29140
2021-12-21 08:34:56 +01:00
Madhura Bhave 9f47c4a7e0 Merge branch '2.7.x' into main 2021-12-20 09:21:38 -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 409f4fdbd7 Merge branch '2.7.x' 2021-12-20 12:37:39 +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 b9057f1957 Merge branch '2.7.x' 2021-12-17 10:50:23 +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 377b58f64c Merge branch '2.7.x' 2021-12-09 15:06:36 +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 fe7b13ec46 Upgrade to Spring Framework 6 and Jakarta EE 9
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872

See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
Andy Wilkinson 4a8904aaa9 Drop support for jOOQ until its dependencies are Jakarta EE 9 compatible
Closes gh-28821
2021-11-30 15:55:48 +00:00
Andy Wilkinson ba19440f8c Drop support for EhCache 3 until it supports Jakarta EE 9
Closes gh-28800
2021-11-30 15:55:48 +00:00
Andy Wilkinson a17d6f9791 Drop support for Infinispan until it is Jakarta EE 9 compatible
Closes gh-28799
2021-11-30 15:55:48 +00:00
Scott Frederick 015dca1956 Remove support for Thymeleaf
Closes gh-28611
2021-11-30 15:55:47 +00:00
Andy Wilkinson f26995307e Remove support for REST Assured until it supports Jakarta EE 9
Closes gh-28722
2021-11-30 15:55:47 +00:00
Andy Wilkinson 85f9949513 Remove support for Jolokia
Closes gh-28704
2021-11-30 15:55:47 +00:00
Andy Wilkinson 79b53e3562 Drop support for auto-configuring Hibernate metrics
Closes gh-28703
2021-11-30 15:55:20 +00:00
Madhura Bhave c8fd5f0080 Remove support for Artemis
Closes gh-28593
2021-11-30 15:39:56 +00:00
Andy Wilkinson 8bf2ffd93c Drop support for Jersey until jersey-spring6 is available
Closes gh-28808
2021-11-30 15:39:39 +00:00
Scott Frederick 29a21d4621 Remove support for Spring Data Couchbase and Couchbase caching
Fixes gh-28613
2021-11-30 15:39:28 +00:00
Andy Wilkinson 0024eba816 Remove dependency management for Apache Johnzon
Closes gh-28616
2021-11-30 15:39:17 +00:00
Andy Wilkinson 63492507b4 Remove support for Apache ActiveMQ
Closes gh-28591
2021-11-30 15:38:46 +00:00
Andy Wilkinson a3c4059ee8 Remove support for H2's web console
Closes gh-28590
2021-11-30 15:38:35 +00:00
Andy Wilkinson 64bf33038d Remove support for EhCache 2
Closes gh-28588
2021-11-30 15:38:23 +00:00
Andy Wilkinson ef02cc9bff Remove support for Atomikos
Closes gh-28589
2021-11-30 15:38:01 +00:00
Andy Wilkinson 99f33ede14 Remove SecurityManager support
Closes gh-28213
2021-11-30 15:37:15 +00:00
Andy Wilkinson 814c86c5e8 Raise the minimum supported version of Gradle to 7.3
Closes gh-28100
2021-11-30 15:36:54 +00:00
izeye c7921468fc Polish
See gh-28836
2021-11-29 09:38:07 +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 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 29725ec68a Update links to Spring Security's reference docs
Closes gh-28618
2021-11-18 11:59:48 +00:00
Stephane Nicoll afa006986b Merge branch '2.5.x'
Closes gh-28713
2021-11-17 09:01:53 +01:00
Vedran Pavic c8dd0a584b Fix "Configure Two DataSources" example
With the present example, the `secondDataSource` bean factory method
will use `firstDataSourceProperties` due to it being annotated with
`@Primary`.

This commit adds the `@Qualifier` needed to ensure `secondDataSource`
bean factory method uses `secondDataSourceProperties`.

See gh-28712
2021-11-17 09:00:14 +01:00
Stephane Nicoll d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
2021-11-17 08:56:08 +01:00
Stephane Nicoll 44b644c770 Merge branch '2.5.x'
Closes gh-28693
2021-11-16 08:59:58 +01:00
Stephane Nicoll 9ed7674ab0 Polish "Fix yaml sample format"
See gh-28671
2021-11-16 08:55:52 +01:00
Weix Sun 7f1bd43c84 Fix yaml sample format
See gh-28671
2021-11-16 08:53:42 +01:00
Stephane Nicoll 6d4537b5ae Merge branch '2.5.x'
Closes gh-28692
2021-11-16 08:50:53 +01:00
Stephane Nicoll 6d79599d99 Polish "Fix yaml sample format in reference doc"
See gh-28670
2021-11-16 08:50:24 +01:00
Weix Sun 793a107d27 Fix yaml sample format in reference doc
See gh-28670
2021-11-16 08:45:50 +01:00
Andy Wilkinson 2a342ef416 Merge branch '2.5.x'
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
2021-11-12 20:04:35 +00:00
Leo Li 508841b444 Replace "e.g." by "for example"
See gh-28583
2021-11-09 19:50:11 +01:00
Jay Bryant 3422b1f38b Replace "refer to" with "see"
Update documentation to replace "refer to" with "see" and to drop
"please" when it is present.

See gh-28537
2021-11-08 14:40:57 -08:00
Jay Bryant 9f2c8f65ee Replace "check out" with more formal language
Update documentation to use more formal language rather than
"check out".

See gh-28503
2021-11-08 14:36:32 -08:00
Phillip Webb c7e61e448e Polish "Remove 'etc' in reference documentation"
See gh-28497
2021-11-08 13:27:24 -08:00
Jay Bryant 0d025b672e Remove 'etc' in reference documentation
Update the reference documentation to replace 'etc' with 'other'.

See gh-28497
2021-11-08 13:24:33 -08:00
Leo Li 73e9c355f1 Polish
See gh-28501
2021-11-02 09:05:44 +01:00
Stephane Nicoll 7ad60df844 Merge branch '2.5.x' 2021-11-02 09:05:11 +01:00
Stephane Nicoll 06e9991e6a Polish
See gh-28501
2021-11-02 09:04:32 +01:00
Andy Wilkinson 4a15a816ce Polish 'Replace "via" with words more suited to an international audience'
See gh-28464
2021-10-28 19:22:11 +01:00
Jay Bryant 73a18c73f4 Replace "via" with words more suited to an international audience
See gh-28464
2021-10-28 17:54:14 +01:00
Stephane Nicoll ea8a8ecd0e Merge branch '2.5.x'
Closes gh-28467
2021-10-28 11:53:34 +02:00
Stephane Nicoll ce38d592f9 Merge branch '2.4.x' into 2.5.x
Closes gh-28466
2021-10-28 11:53:19 +02:00
Stephane Nicoll 265199f42b Polish "Fix description of "logging.logback.rollingpolicy.max-history""
See gh-28448
2021-10-28 11:50:38 +02:00
Phillip Webb 9cb5f035e7 Fix typo
See gh-20971
2021-10-23 08:29:51 -07:00
Andy Wilkinson 1005159eab Merge branch '2.5.x'
Closes gh-28435
2021-10-22 12:30:47 +01:00
Andy Wilkinson 3fb5af9dd3 Merge branch '2.4.x' into 2.5.x
Closes gh-28434
2021-10-22 12:29:14 +01:00
Andy Wilkinson 8a78864edd Polish "Explain how to disable/configure the ActiveMQ embedded broker"
See gh-28183
2021-10-22 12:27:50 +01:00
Moritz Kammerer 0c5f0efcea Explain how to disable/configure the ActiveMQ embedded broker
See gh-28183
2021-10-22 12:27:37 +01:00
Andy Wilkinson d52b649bd7 Fix links to Spring Security's reference documentation
Closes gh-28407
2021-10-21 19:11:52 +01:00
Phillip Webb cf9156e497 Add SameSite cookie support for servlet web servers
Update Tomcat, Jetty and Undertow `ServletWebServerFactory`
implementations so that they can write SameSite cookie attributes.

The session cookie will be customized whenever the
`server.servlet.session.cookie.same-site` property is set.

Other cookies can be customized with the new `CookieSameSiteSupplier`
interface which can be registered using `@Bean` methods.

Closes gh-20971

Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-10-20 22:58:31 -07:00
Phillip Webb 3729c4909a Polish package name for web sample code
See gh-27132
2021-10-20 21:31:41 -07:00
Andy Wilkinson 56b8494f15 Disable the env info contributor by default
Closes gh-28311
2021-10-20 12:42:17 +01:00
Andy Wilkinson f98c1e7231 Disable the java info contributor by default
Closes gh-28310

Co-authored-by Phillip Webb <pwebb@vmware.com>
2021-10-20 12:18:54 +01:00
Andy Wilkinson 356554311f Merge branch '2.5.x'
Closes gh-28381
2021-10-19 17:17:29 +01:00
Artem Bilan 344d008848 Remove redundant info about DefaultMetricsFactory
The DefaultMetricsFactory was removed from Spring Integration starting
with version 5.4. This commit updates the documentation to match.

See gh-28375
2021-10-19 16:55:51 +01:00
Andy Wilkinson 89b40e1e00 Add support for Log4j2's composite configuration
Closes gh-27110
2021-10-19 10:01:30 +01:00
Madhura Bhave a86a84e00b Merge branch '2.5.x' into main
Closes gh-28202
2021-10-05 15:46:26 -07:00
Madhura Bhave 9f4cf8398b Merge branch '2.4.x' into 2.5.x
Closes gh-28201
2021-10-05 15:46:04 -07:00
Madhura Bhave 61736e9958 Polish " Update configtree docs about dot notation being correctly mapped"
See gh-28170
2021-10-05 15:43:20 -07:00
deb-von-seggern 8f91fc450d Update configtree docs about dot notation being correctly mapped
See gh-28170
2021-10-05 15:14:02 -07:00
Stephane Nicoll 5d17257a52 Polish "Add Java InfoContributor"
See gh-28136
2021-10-05 15:11:58 +02:00
Stephane Nicoll 1008b754d7 Merge branch '2.5.x'
Closes gh-28194
2021-10-05 08:36:28 +02:00
Stephane Nicoll d22167b96a Merge branch '2.4.x' into 2.5.x
Closes gh-28193
2021-10-05 08:35:24 +02:00
Pratik Gupta a3423f1edf Fix log4j2 file name reference in reference doc
See gh-28189
2021-10-05 08:32:59 +02:00
Stephane Nicoll 1b7536fda4 Merge branch '2.5.x'
Closes gh-28160
2021-10-01 08:14:03 +02:00
Stephane Nicoll 1c139b1d23 Merge branch '2.4.x' into 2.5.x
Closes gh-28159
2021-10-01 08:13:49 +02:00
Stephane Nicoll bedd749e1c Polish "Clarify use of @AutoConfigureTestEntityManager"
See gh-28086
2021-10-01 08:12:01 +02:00
Leo Li 70f64f2c26 Clarify use of @AutoConfigureTestEntityManager
This commit makes it clearer that, when using
@AutoConfigureTestEntityManager outside of @DataJpaTest, any tests using
the test entity manager must be @Transactional.

See gh-28086
2021-10-01 07:55:57 +02:00
Stephane Nicoll 9e1ef76f84 Polish "Replace latin locutions in the documentation"
See gh-28141
2021-10-01 07:38:41 +02:00
Vincent Ricard 873bca36c4 Replace latin locutions in the documentation
See gh-28141
2021-10-01 07:33:01 +02:00
Andy Wilkinson ea68672594 Merge branch '2.5.x'
Closes gh-28153
2021-09-30 17:06:09 +01:00
Andy Wilkinson 9e484e2cdc Merge branch '2.4.x' into 2.5.x
Closes gh-28152
2021-09-30 17:05:39 +01:00
Andy Wilkinson 3824512357 Tighten up build's task interdependencies
Closes gh-28103
2021-09-30 15:35:39 +01:00
Stephane Nicoll 2d34cff902 Polish "Improve Dynatrace examples description in reference guide"
See gh-27502
2021-09-30 10:08:15 +02:00
Georg Pirklbauer c236532607 Improve Dynatrace examples description in reference guide
See gh-27502
2021-09-30 09:59:44 +02:00
Artem Bilan b2d1423e34 Add Spring Integration default poller auto-config
When polling consumers or source polling channel adapters are used in
Spring Integration applications, they require some polling policy to
be configured.

This comment auto-configures a PollerMetadata bean which customized
via newly added `spring.integration.poller.*` configuration
properties or overriden completely be user-defined bean.

See gh-27992
2021-09-23 16:20:13 -07:00
Stephane Nicoll 842f3f0bd5 Merge branch '2.5.x'
Closes gh-28099
2021-09-22 09:14:09 +02:00
Stephane Nicoll 77b778ce95 Document support for Java 17
Closes gh-26767
2021-09-22 08:58:29 +02:00
Phillip Webb bc6b9be7cd Merge branch '2.5.x'
Closes gh-28084
2021-09-21 15:54:54 -07:00
Phillip Webb 8c3db23be3 Merge branch '2.4.x' into 2.5.x
Closes gh-28083
2021-09-21 15:53:37 -07:00
cdalexndr 798b282e58 Document that devtools restart doesn't work with AspectJ weaving
See gh-28071
2021-09-21 15:51:36 -07:00
Phillip Webb 61a84a4722 Polish asciidoctor links
Update `<<..>>` links to include the page.
2021-09-21 15:44:53 -07:00
dreis2211 3e831fe286 Fix link in caching docs
See gh-28078
2021-09-21 15:32:06 -07:00
Phillip Webb 667e5ca30c Polish 2021-09-21 14:45:01 -07:00
Stephane Nicoll 124c3ac07c Polish "Add support for used-defined RedisStandaloneConfiguration"
See gh-28028
2021-09-21 08:34:44 +02:00
dreis2211 cf0fcafd13 Polish
See gh-27940
2021-09-21 08:08:29 +02:00
Stephane Nicoll eab8f41152 Polish "Remove english contractions from the documentation"
See gh-28064
2021-09-21 08:04:48 +02:00
Vincent Ricard 52176b8ed6 Remove english contractions from the documentation
See gh-28064
2021-09-21 08:00:48 +02:00
Stephane Nicoll 3ef17820e9 Polish 2021-09-21 07:59:33 +02:00
Madhura Bhave ac00df79f1 Add what's next to new sections
This commit also moves hazelcast from core features to IO

Closes gh-27132
2021-09-20 16:15:08 -07:00
Madhura Bhave 7e257dc24c Rename packages for code samples to match sections
See gh-27132
2021-09-20 16:15:08 -07:00
Andy Wilkinson e2a355f003 Consolidate Elasticsearch configuration properties
Previously, a number of Elasticsearch properties were duplicated
across the spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive prefixes for configuring
the blocking REST client provided by Elasticsearch and the reactive
client provided by Spring Data respectively. This could cause
problems when using the Elasticsearch REST client configured with
a custom spring.elasticsearch.rest.uris. If Spring WebFlux (to make
use of WebClient) and Spring Data Elasticsearch were on the classpath,
the reactive Elasticsearch Client would be autoconfigured but it
would use the default value of its analogous
spring.data.elasticsearch.client.reactive.endpoints property. It
would be unable to connect, causing a startup failure.

This commit consoliates the configuration properties where possible.
Each setting that is common across the two clients is now configured
using a single, shared spring.elasticsearch property. Each setting
that is specific to the blocked REST client or the WebClient-based
reactive client now have prefixes of spring.elasticsearch.restclient
and spring.elasticsearch.webclient respectively.

The old properties beneath spring.elasticsearch.rest and
spring.data.elasticsearch.client.reactive have been deprecated. If a
any deprecated property is set, all of the new properties are
ignored. In other words, to migrate to the new properties, each usage
of a now-deprecated property must be updated to use its new
replacement instead.

Closes gh-23106
2021-09-20 14:37:44 +01:00
Stephane Nicoll 7957d97528 Polish 2021-09-16 14:12:23 +02:00
Stephane Nicoll c62a6819fe Polish "Add startup time metrics"
See gh-27878
2021-09-16 13:33:08 +02:00
Andy Wilkinson 32cfde074f Merge branch '2.5.x' 2021-09-16 12:11:42 +01:00
Andy Wilkinson 9df099e343 Polish 2021-09-16 12:11:34 +01:00
Stephane Nicoll e1b1a25021 Polish "Auto-configure Micrometer's Lettuce latency metrics"
See gh-27865
2021-09-14 09:33:48 +02:00
Antonin ARQUEY 190fea6faa Auto-configure Micrometer's Lettuce latency metrics
Add auto-configuration support to export Lettuce latency metrics.

See gh-27865
2021-09-14 09:19:42 +02:00
Stephane Nicoll c4823f80cd Polish "Fix some typos in docs"
See gh-27968
2021-09-14 09:18:04 +02:00
Dmitriy Bogdanov 2ad3428039 Fix some typos in docs
See gh-27968
2021-09-14 09:16:13 +02:00
Stephane Nicoll 43a19c16a8 Merge branch '2.5.x'
Closes gh-27944
2021-09-12 09:02:50 +02:00
Stephane Nicoll 2327cda5c9 Merge branch '2.4.x' into 2.5.x
Closes gh-27943
2021-09-12 09:02:35 +02:00
cdalexndr 60bc94e1d4 Clarify Selenium auto-configuration requires HtmlUnit
The auto-configuration requires `HtmlUnit`, so this auto-cofiguration
only works if both Selenium and HtmlUnit are used.

Prevents misinterpretation that WebDriver can be auto configured without
htmlunit.

See gh-27920
2021-09-12 09:00:18 +02:00
Stephane Nicoll 78d6c94a7e Polish "Auto-Configure Kafka CommonErrorHandler"
See gh-27927
2021-09-10 08:20:10 +02:00
Yanming Zhou 6e9bdacc10 Include WebMvcRegistrations beans in WebMvcTest
See gh-27823
2021-09-10 07:55:26 +02:00
Phillip Webb 56595c0027 Use consistent case for 'Servlet' and 'Filter' in documentation
Closes gh-27896
2021-09-08 17:56:44 -07:00
Jay Bryant f7f5f9fb96 Make editorial changes to actuator documentation
See gh-27759
2021-09-08 17:33:07 -07:00
Jay Bryant 2691828d2b Update actuator docs to prefer "You can..."
Edit the actuator docs so that more "You can..." phrasing is used.

For example
	"Auditing can be enabled by providing"
becomes
	"You can enable auditing by providing"

See gh-27759
2021-09-08 17:33:07 -07:00
Jay Bryant 53363c84cb Improve actuator example lead-in text
Update example lead-in text to a slightly shorter form.

For example
	"as shown in the following example"
Becomes
	"as the following example shows"

See gh-27759
2021-09-08 17:33:07 -07:00
Jay Bryant e44585d89a Polish actuator docs markup and formatting
Improve consistency of the asciidoctor markup and formatting for
the actuator section.

See gh-27759
2021-09-08 17:33:07 -07:00
Stephane Nicoll 2286f58e23 Merge branch '2.5.x'
Closes gh-27877
2021-09-05 17:29:17 +02:00
Stephane Nicoll 7cc8668540 Merge branch '2.4.x' into 2.5.x
Closes gh-27876
2021-09-05 17:29:01 +02:00
Yanming Zhou 6bf92f06e9 Fix inconsistent devtools doc
See gh-27812
2021-09-05 17:28:02 +02:00
Andy Wilkinson e299175eef Polish "Only link to other formats from each format of the ref docs"
See gh-27737
2021-08-23 17:36:11 +01:00
Jay Bryant edab97a3e4 Only link to other formats from each format of the ref docs
See gh-27737
2021-08-23 17:35:40 +01:00
Jay Bryant 47bbae8356 Polish the multi-page documentation's index
See gh-27805
2021-08-23 15:55:47 +01:00
Andy Wilkinson 07d9a614e0 Merge branch '2.5.x'
Closes gh-27804
2021-08-23 15:45:51 +01:00
Andy Wilkinson b508d77a4e Merge branch '2.4.x' into 2.5.x
Closes gh-27803
2021-08-23 15:45:33 +01:00
Andy Wilkinson 990b766847 Polish "Document how to parameterize REST Docs' output dir with WebTestClient"
See gh-27755
2021-08-23 15:36:16 +01:00
Berchris Requiao c83f6ebaa2 Document how to parameterize REST Docs' output dir with WebTestClient
See gh-27755
2021-08-23 15:30:21 +01:00
Madhura Bhave 2c9945efc7 Merge pull request #27761 from dreis2211
* pr/27761:
  Fix broken links in docs

Closes gh-27761
2021-08-18 15:51:37 -07:00
dreis2211 7c8ccfc4c1 Fix broken links in docs
See gh-27761
2021-08-18 15:51:14 -07:00
Madhura Bhave 8fd9eb72d4 Allow part of a composite contributor in a health group
Closes gh-23027

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-08-18 15:44:10 -07:00
Stephane Nicoll b65cc4d62f Relocate DiskSpace metrics to SystemMetricsAutoConfiguration
Closes gh-27688
2021-08-16 14:54:05 +02:00
Stephane Nicoll 1475309b4d Polish "Add expiry and bufferLength configuration properties"
See gh-27584
2021-08-16 10:05:47 +02:00
Madhura Bhave 49c86e6e1b Allow health groups to be configured at an additional path
Closes gh-25471

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-08-11 19:25:25 -07:00
Brian Clozel 8b3bea173c Configure WebTestClient for @AutoConfigureMockMvc tests
As of Spring Framework 5.3, `WebTestClient` can now be configured on top
of `MockMvc` for testing Spring MVC applications in a mock environment.

Prior to this commit, `WebTestClient` would be already configured for
WebFlux mock setups with `@AutoConfigureWebTestClient` or live servers
(for both MVC and WebFlux apps).

This commit enhances the `@AutoConfigureWebMvc` support so that a
`WebTestClient` instance is auto-configured if the spring-webflux
dependency is present on the classpath.

Closes gh-23067
2021-08-03 09:43:44 +02:00
Andy Wilkinson 64c0eceec7 Add support for dumping the heap on OpenJ9
Closes gh-26466
2021-07-30 15:35:59 +01:00
Andy Wilkinson 621844abda Polish "Use MessageSource to interpolate bean validation messages"
See gh-17530
2021-07-26 12:10:15 +01:00
Andy Wilkinson a5656e0932 Make @ConstructorBinding implict for config prop records
Closes gh-27216
2021-07-24 10:03:37 +01:00
Andy Wilkinson 37f690323f Polish
Closes gh-27432
2021-07-21 11:55:38 +01:00
Andy Wilkinson bb26b7bdf5 Polish
Closes gh-27431
2021-07-21 11:53:10 +01:00
Andy Wilkinson 8e7a6ceb44 Polish "Make dev tools' home directory configurable"
See gh-17924
2021-07-19 17:56:34 +01:00
Andy Wilkinson 6d50e65572 Revert "Add support for InfluxDB 2.x"
This reverts commit 52fedb2bb4.

See gh-25891
2021-07-19 13:28:08 +01:00
Andy Wilkinson 4d30eb453f Adopt Hiberate's CamelCaseToUnderscoresNamingStrategy
Closes gh-27352
2021-07-19 13:19:49 +01:00
Andy Wilkinson d60191add2 Merge pull request #26258 from pirgeo
* gh-26258:
  Polish "Refine documentation"
  Refine documentation
  Polish "Add properties for Dynatrace metrics API v2 ingest with Micrometer"
  Add properties for Dynatrace metrics API v2 ingest with Micrometer

Closes gh-26258
2021-07-16 17:39:38 +01:00
Andy Wilkinson 21b3202ab2 Polish "Refine documentation"
See gh-26258
2021-07-16 17:17:57 +01:00
Georg Pirklbauer d0cd3ab1d3 Refine documentation
See gh-26258
2021-07-16 17:05:19 +01:00
Andy Wilkinson 43f1b98864 Polish "Add @WebServiceServerTest slice test support"
See gh-27091
2021-07-16 11:28:39 +01:00
Madhura Bhave cdd80e660a Merge branch '2.5.x' into main
Closes gh-27358
2021-07-15 16:16:31 -07:00
anvithabs e48efa158b Fix reference to a configuration property in cloud.adoc
See gh-27357
2021-07-15 16:14:55 -07:00
Andy Wilkinson 84455f86fd Polish "Add properties for Dynatrace metrics API v2 ingest with Micrometer" 2021-07-15 13:07:37 +01:00
Georg Pirklbauer 3161164912 Add properties for Dynatrace metrics API v2 ingest with Micrometer 2021-07-15 11:57:58 +01:00
Andy Wilkinson d21f8df1ad Polish "Auto-configure Jetty connection and SSL metrics"
See gh-26418
2021-07-13 14:01:15 +01:00
Andy Wilkinson d7fd675f58 Merge branch '2.5.x'
Closes gh-27302
2021-07-13 12:18:26 +01:00
Andy Wilkinson d9e525c326 Merge branch '2.4.x' into 2.5.x
Closes gh-27301
2021-07-13 12:18:07 +01:00
Andy Wilkinson 2354dd5ccb Include Jetty metrics in list of supported metrics
Closes gh-27299
2021-07-13 12:06:28 +01:00
Andy Wilkinson 4d76660f17 Polish "Remove default spring.mongodb.embedded.version"
See gh-27108
2021-07-13 10:46:46 +01:00
bono007 d16ecab24b Remove default spring.mongodb.embedded.version
See gh-27108
2021-07-13 10:13:54 +01: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 32a1644cca Split spring boot features into multiple sections
See gh-27132
2021-06-30 22:17:48 -07: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
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 d4fa46f1b9 Polish startup endpoint description in reference doc
Closes gh-26978
2021-06-24 07:19:58 +02:00
Phillip Webb e85b0c7012 Merge branch '2.5.x' 2021-06-23 17:29:41 -07:00
Phillip Webb fd83158fa5 Merge branch '2.4.x' into 2.5.x 2021-06-23 17:28:31 -07:00
Phillip Webb 5fc0e1ca81 Merge branch '2.5.x'
Closes gh-27057
2021-06-23 17:23:25 -07:00
Phillip Webb af37f59136 Merge branch '2.4.x' into 2.5.x
Closes gh-27056
2021-06-23 17:13:13 -07:00
Andy Wilkinson 4290193a65 Merge branch '2.5.x'
Closes gh-27025
2021-06-22 13:20:11 +01:00
Andy Wilkinson 051638631b Merge branch '2.4.x' into 2.5.x
Closes gh-27024
2021-06-22 13:02:06 +01:00
Andy Wilkinson ba9244b2d4 Polish "Update docs to use @SpringBootConfiguration not @Configuration"
See gh-26937
2021-06-22 12:55:25 +01:00
Yanming Zhou a5f077cf79 Update docs to use @SpringBootConfiguration not @Configuration
See gh-26937
2021-06-22 12:55:25 +01:00
Stephane Nicoll 63fe89f641 Merge branch '2.5.x'
Closes gh-26957
2021-06-18 08:29:36 +02:00
Yanming Zhou 12a6e4c231 Add missing space for asciidoc ordered list
See gh-26955
2021-06-18 08:27:45 +02:00
Phillip Webb ad8ce2aa05 Merge branch '2.5.x' 2021-06-16 23:43:14 -07:00
Phillip Webb 5c65b1bcde Fix asciidoctor anchor references
See gh-26939
2021-06-16 23:42:29 -07:00
Phillip Webb 7bd6611e4c Merge branch '2.5.x'
Closes gh-26940
2021-06-16 22:43:52 -07:00
Phillip Webb c3b873c11d Merge branch '2.4.x' into 2.5.x
Closes gh-26939
2021-06-16 22:43:13 -07:00
Phillip Webb b5c92d5174 Allow indirect standard profile-specific imports
Effectively revert commit d1b256a169 so that profile-specific imports
can again be used with or without a parent import.

Fixes gh-26858
2021-06-16 22:30:29 -07:00
Stephane Nicoll a1a86e75ac Merge branch '2.5.x'
Closes gh-26912
2021-06-15 08:38:51 +02:00
Stephane Nicoll 96029dbd8a Polish "Add Azure info to the cloud deployment docs"
See gh-26910
2021-06-15 08:35:56 +02:00
Andy Clement 8321faaf16 Add Azure info to the cloud deployment docs
See gh-26910
2021-06-15 08:34:29 +02:00
Stephane Nicoll 52fedb2bb4 Add support for InfluxDB 2.x
Closes gh-25891
2021-06-15 08:21:37 +02:00
Madhura Bhave aa873d3a22 Reorder documentation overview section
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
2021-06-14 10:48:49 -07:00
Madhura Bhave 91ca9763e0 Reorder documentation overview section
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
2021-06-14 10:25:01 -07:00
Andy Wilkinson bc715c64b1 Merge branch '2.5.x'
Closes gh-26892
2021-06-14 13:33:19 +01:00
Andy Wilkinson 5f26fd9ccb Merge branch '2.4.x' into 2.5.x
Closes gh-26891
2021-06-14 13:28:54 +01:00
Andy Wilkinson f6b7730dac Use Asciidoctor's revision line to provide document's version
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.

Closes gh-26851
2021-06-14 13:24:01 +01:00
Stephane Nicoll a0cf1eed41 Add support for customizing the auto-configured ClientResources
Closes gh-26792
2021-06-14 09:32:43 +02:00
Stephane Nicoll f8555b9071 Add metrics for task execution and scheduling
Closes gh-23818
2021-06-14 09:07:40 +02:00
Stephane Nicoll 6505e03cb2 Polish "Add auto-configuration for Spring Data Envers"
See gh-22610
2021-06-14 08:28:17 +02:00
Stephane Nicoll d17c475504 Polish "Enable Redis connection pool if commons-pool2 is available"
See gh-26326
2021-06-14 08:25:21 +02:00
Stephane Nicoll 6b4efcce11 Polish "Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder"
See gh-26341
2021-06-12 17:51:57 +02:00
Stephane Nicoll 69c2621a14 Polish "Add support for @Value annotation"
See gh-26337
2021-06-12 17:40:34 +02:00
bono007 e3f03dd50a Add auto-configuration for DiskSpaceMetrics
See gh-26001
2021-06-11 17:01:36 +02:00
Madhura Bhave 2e2d1fe8d3 Merge branch '2.4.x' into main 2021-06-09 14:46:36 -07:00
Madhura Bhave e3042b38f5 Merge branch '2.3.x' into 2.4.x 2021-06-09 14:45:23 -07:00
Madhura Bhave 63806d5bac Remove duplicate copyright notice from docs 2021-06-09 14:44:44 -07:00
Andy Wilkinson de410b7621 Merge branch '2.4.x'
Closes gh-26828
2021-06-09 18:01:32 +01:00
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
2021-06-09 18:00:45 +01:00
Phillip Webb f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Andy Wilkinson c52143727a Reinstate mode for controlling DB initialization
Closes gh-26682
2021-06-08 15:13:55 +01:00
Phillip Webb abd926788f Merge branch '2.4.x'
Closes gh-26782
2021-06-06 21:53:10 -07:00
Phillip Webb 7396e1e743 Fix property ordering within '.' and '/config'
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.

Prior to this commit, the default search locations considered for
application properties/yaml files was the following:

	optional:classpath:/
	optional:classpath:/config/
	optional:file:./
	optional:file:./config/
	optional:file:./config/*/

Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.

This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files

	optional:classpath:/;optional:classpath:/config/
	optional:file:./;optional:file:./config/;optional:file:./config/*/

Closes gh-26593
2021-06-06 21:05:54 -07:00
Madhura Bhave 554cf9d7c7 Merge branch '2.4.x' into main
Closes gh-26741
2021-06-02 12:24:36 -07:00
Madhura Bhave 2ff3fe22e5 Merge branch '2.3.x' into 2.4.x
Closes gh-26740
2021-06-02 12:20:02 -07:00
Madhura Bhave d0e2925dcc Fix link to Spring Data JPA docs
Fixes gh-26736
2021-06-02 12:18:57 -07:00
Stephane Nicoll 1f95989e85 Merge branch '2.4.x'
Closes gh-26735
2021-06-02 13:56:13 +02:00
Stephane Nicoll 363c43e315 Merge branch '2.3.x' into 2.4.x
Closes gh-26734
2021-06-02 13:52:03 +02:00
Stephane Nicoll 3f23b9265d Clarify when a connection pool is created for Redis
Closes gh-26733
2021-06-02 13:49:16 +02:00
Madhura Bhave 54c3194164 Merge branch '2.4.x' into main
Closes gh-26701
2021-05-28 14:38:28 -07:00
Madhura Bhave 5314bda48d Merge branch '2.3.x' into 2.4.x
Closes gh-26700
2021-05-28 14:30:44 -07:00
Madhura Bhave f55e4c08f5 Add note about Kubernetes termination grace period
Closes gh-26469
2021-05-28 14:30:04 -07:00
Stephane Nicoll 454d72d9b2 Document spring.profiles.default in the reference guide
Closes gh-26592
2021-05-28 13:29:27 +02:00
Stephane Nicoll e5ee1eb86f Merge branch '2.4.x'
See gh-26654
2021-05-26 09:27:52 +02:00
Stephane Nicoll 130261f0df Merge branch '2.3.x' into 2.4.x
See gh-26653
2021-05-26 09:21:17 +02:00
Stephane Nicoll 3fbf5eeb5b Document spring.profiles.default in the reference guide
Closes gh-26592
2021-05-26 09:20:58 +02:00
Stephane Nicoll f3d4fdb9c4 Merge branch '2.4.x'
Closes gh-26655
2021-05-25 10:46:40 +02:00
Stephane Nicoll fe1e2319b2 Polish "Clarify Kotlin version requirements in documentation"
See gh-26421
2021-05-25 10:45:08 +02:00
Lovekesh Garg 944ba34556 Clarify Kotlin version requirements in documentation
See gh-26421
2021-05-25 10:44:51 +02:00
Oliver B. Fischer 11af8a816c Add link to Maven Git Commit Id Plugin
See gh-26635
2021-05-23 16:37:44 +02:00
Phillip Webb ab958d2394 Include io.spring.asciidoctor.backends group
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.

See gh-26293
2021-05-19 22:58:31 -07:00
Phillip Webb 8a3f835ffe Set Asciidoctor attribute-missing to warn
Closes gh-26590
2021-05-19 11:53:46 -07:00
weixsun d2bdcddb5f Fix outdated defaults for Info endpoint
See gh-26591
2021-05-19 17:42:13 +02:00
Phillip Webb 34b288e5fe Add prefix to appendix property anchor links
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.

Closes gh-26375
2021-05-18 21:19:24 -07:00
Phillip Webb 86a5c90d20 Simplify anchor-rewrite.properties 2021-05-18 21:19:09 -07:00
Phillip Webb e08d4f1fe6 Move "Use Jedis Instead of Lettuce" How-to
See gh-26262
2021-05-18 11:53:26 -07:00
Phillip Webb 499a29c415 Move "Testcontainers" How-to
See gh-26262
2021-05-18 11:49:03 -07:00
Phillip Webb 72d50ed2f8 Move "Testing With Spring Security" How-to
See gh-26262
2021-05-18 11:49:02 -07:00
Phillip Webb 5f7e3d3952 Polish 2021-05-18 11:39:20 -07:00
Andy Wilkinson 88b383c6bb Polish "Update docs and internal dep mgmt following Spock 2.0's release"
See gh-26586
2021-05-18 10:00:05 +01:00
dreis2211 5a6c355397 Update docs and internal dep mgmt following Spock 2.0's release
See gh-26586
2021-05-18 09:59:29 +01:00
Andy Wilkinson 4bf5ff8a68 Merge branch '2.4.x'
Closes gh-26526
2021-05-17 11:52:53 +01:00
Andy Wilkinson 2ef7d136ac Merge branch '2.3.x' into 2.4.x
Closes gh-26525
2021-05-17 11:48:34 +01:00
Andy Wilkinson ca85555fde Polish "Document use of module replacements to swap dependencies"
See gh-25944
2021-05-17 11:44:23 +01:00
Caleb Cushing f5b536164c Document use of module replacements to swap dependencies
See gh-25944

Signed-off-by: Caleb Cushing <xenoterracide@gmail.com>
2021-05-17 11:29:36 +01:00
Andy Wilkinson 05a64ecb2c Merge branch '2.4.x'
Closes gh-26522
2021-05-17 11:24:29 +01:00
Andy Wilkinson 2a2c68f8f2 Merge branch '2.3.x' into 2.4.x
Closes gh-26521
2021-05-17 11:22:48 +01:00
Andy Wilkinson be807bab12 Polish "Improve documentation of TestRestTemplate's fault tolerance"
See gh-26227
2021-05-17 11:07:42 +01:00
weixsun 8a2be288a3 Remove unnecessary throws declaration in tests
See gh-26441
2021-05-17 09:31:51 +02:00
Andy Wilkinson a623dab0aa Merge branch '2.4.x'
Closes gh-26474
2021-05-15 08:57:23 +01:00
Andy Wilkinson 3295b59563 Merge branch '2.3.x' into 2.4.x
Closes gh-26473
2021-05-15 08:56:09 +01:00
Andy Wilkinson 47626bebd1 Note that the heapdump endpoint requires a HotSpot JVM
Closes gh-26467
2021-05-15 08:55:59 +01:00
Andy Wilkinson f44c99df26 Merge branch '2.4.x'
Closes gh-26452
2021-05-13 14:01:37 +01:00
Andy Wilkinson fd3d619670 Recommend default Servlet when using Jersey as a Filter
Closes gh-25733
2021-05-13 13:58:07 +01:00
Phillip Webb 87d8aedd3c Use spring-pdf backend for PDF generation
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.

Closes gh-26373
2021-05-10 18:04:05 -07:00
Andy Wilkinson dc5f115c04 Document support for Gradle 6.9
Closes gh-26409
2021-05-07 11:29:51 +01:00
Phillip Webb d3207b107c Polish docs 2021-05-05 23:42:22 -07:00
Phillip Webb 65c00f373a Polish 2021-05-04 14:07:58 -07:00
Phillip Webb 711a0c19e6 Use consistent asciidoctor subs attribute
Closes gh-25101
2021-05-04 13:01:20 -07:00
Phillip Webb 979fa12ca9 Polish source type for Gradle snippets 2021-05-04 10:35:39 -07:00
Phillip Webb 57e54af6f5 Delete R2dbcDatabaseInitializationConfiguration
The `R2dbcDatabaseInitializationConfiguration` docs class is not needed
in 2.5.x.

Closes gh-26225
2021-05-04 08:15:14 -07:00
Phillip Webb d6d1d95741 Use American English spellings 2021-05-03 22:39:45 -07:00
Phillip Webb b5583a4620 Polish doc code samples
See gh-6313
2021-05-03 22:39:44 -07:00
Phillip Webb 9aad29da0c Extract code samples from docs
See gh-6313
2021-05-03 17:46:37 -07:00
Phillip Webb b314d848dc Polish docs code
See gh-6313
2021-04-30 18:19:52 -07:00
Phillip Webb 09e85806d6 Align docs package structure with heading IDs
See gh-6313
2021-04-30 16:34:35 -07:00
dreis2211 ca3105920b Fix link to Webservices reference docs
See gh-26316
2021-04-30 08:27:22 +02:00
Phillip Webb 33c6c600a9 Split up adoc files
Closes gh-23254
2021-04-29 17:32:27 -07:00
Andy Wilkinson 5d8a64e186 Validate section IDs in the reference documentation
See gh-26307
2021-04-29 15:40:54 +01:00
Stephane Nicoll 242f2ba6bd Merge branch '2.4.x'
Closes gh-26299
2021-04-29 12:30:09 +02:00
Stephane Nicoll f8a4aefce0 Merge branch '2.3.x' into 2.4.x
Closes gh-26298
2021-04-29 12:29:55 +02:00
Stephane Nicoll 0c09841013 Document property names to enable reactive health indicators
Closes gh-26279
2021-04-29 12:28:43 +02:00
Phillip Webb 5dce5ee595 Align adoc filename with anchors
See gh-26296
2021-04-28 22:34:16 -07:00
Phillip Webb bd3f4d74be Rationalize reference documentation anchors
Closes gh-26296
2021-04-28 21:56:51 -07:00
Stephane Nicoll 80248dcc13 Merge branch '2.4.x'
Closes gh-26283
2021-04-28 16:14:58 +02:00
Stephane Nicoll 77a231d742 Merge branch '2.3.x' into 2.4.x
Closes gh-26282
2021-04-28 16:14:46 +02:00
Stephane Nicoll e7bf0a0bd6 Fix key to datasource health indicator in reference doc
Closes gh-26268
2021-04-28 16:14:06 +02:00
Andy Wilkinson 6953da2013 Merge branch '2.4.x'
Closes gh-26257
2021-04-27 15:19:04 +01:00
Andy Wilkinson a1138efc5f Merge branch '2.3.x' into 2.4.x
Closes gh-26256
2021-04-27 15:18:23 +01:00
Andy Wilkinson a470c1af3a Align documentation with main default branch name
Closes gh-26255
2021-04-27 15:18:00 +01:00
Andy Wilkinson 091907f762 Rename default branch to main
Closes gh-26248
2021-04-27 11:27:37 +01:00
Phillip Webb d42ad237f5 Merge branch '2.4.x'
Closes gh-26242
2021-04-26 17:44:26 -07:00
Phillip Webb 94a70d6837 Merge branch '2.3.x' into 2.4.x
Closes gh-26241
2021-04-26 17:42:00 -07:00
Phillip Webb f82b33698d Add missing asciidoctor heading anchors
Closes gh-26239
2021-04-26 17:35:14 -07:00
Phillip Webb 5e8f383947 Extract code samples from docs
See gh-6313
2021-04-26 14:01:37 -07:00
Phillip Webb 32a87fcbda Extract code samples from docs
See gh-6313
2021-04-25 16:07:26 -07:00
Phillip Webb f30d48e3b3 Extract code samples from docs
See gh-6313
2021-04-23 23:41:06 -07:00
Phillip Webb 02cc778911 Extract code samples from docs
See gh-6313
2021-04-23 19:10:09 -07:00
Stephane Nicoll a7b0f90609 Merge branch '2.4.x'
Closes gh-26211
2021-04-22 14:48:30 +02:00
Stephane Nicoll e424c1c4b4 Merge branch '2.3.x' into 2.4.x
Closes gh-26210
2021-04-22 14:48:15 +02:00
Shimizu, Yuko 474e460d5e Align Maven version in system requirements with what is actually tested
See gh-26209
2021-04-22 14:47:29 +02:00
Stephane Nicoll e3f81f0243 Merge branch '2.4.x' 2021-04-21 17:23:42 +02:00
Stephane Nicoll db7460ddd5 Polish contribution based on Andy's review
See gh-26188
2021-04-21 17:23:21 +02:00
Stephane Nicoll 3ca6ed6246 Polish
Closes gh-26190
2021-04-21 17:20:22 +02:00
izeye 4be48d0d50 Polish
See gh-26188
2021-04-21 15:20:06 +02:00
Stephane Nicoll 6c68f3652c Merge branch '2.4.x'
Closes gh-26186
2021-04-21 10:03:41 +02:00
Stephane Nicoll 8edeb2c7a9 Merge branch '2.3.x' into 2.4.x
Closes gh-26185
2021-04-21 10:03:32 +02:00
Stephane Nicoll 856e0d0535 Document that MeterFilters are only applied to a managed registry
Closes gh-25610
2021-04-21 10:02:57 +02:00
Andy Wilkinson b9348c6d28 Merge branch '2.4.x'
Closes gh-26169
2021-04-20 11:26:46 +01:00
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x
Closes gh-26168
2021-04-20 11:19:10 +01:00
Andy Wilkinson 82198a99e0 Polish nohttp configuration
Closes gh-26166
2021-04-20 11:15:13 +01:00
Stephane Nicoll 57d35aba12 Merge branch '2.4.x'
Closes gh-26160
2021-04-19 17:09:45 +02:00
Stephane Nicoll 6bbd36c77a Merge branch '2.3.x' into 2.4.x
Closes gh-26159
2021-04-19 17:01:28 +02:00
Stephane Nicoll 03b65f3260 Polish "Enhance multiple entity manager factories how-to"
See gh-14928
2021-04-19 16:59:31 +02:00
Niclas Fredriksson 0d9db46f68 Enhance multiple entity manager factories how-to
See gh-14928
2021-04-19 16:53:50 +02:00
Andy Wilkinson 5142fe9b8e Fix typo in Initialize a Database using basic SQL scripts
Closes gh-26137
2021-04-15 17:03:31 +01:00
izeye e27c85698d Polish
See gh-26135
2021-04-15 16:31:10 +02:00
dreis2211 beb7f7b02d Avoid some redirects in docs
See gh-26129
2021-04-15 10:39:07 +02:00
Stephane Nicoll e2252c7856 Merge branch '2.4.x'
Closes gh-26111
2021-04-14 15:44:10 +02:00
Stephane Nicoll 401ebc672b Merge branch '2.3.x' into 2.4.x
Closes gh-26110
2021-04-14 15:43:57 +02:00
Stephane Nicoll ab785d9417 Document limitations of using deferred JPA bootstrap
Closes gh-24027
2021-04-14 15:38:34 +02:00
Stephane Nicoll c5214b3c84 Merge branch '2.4.x'
Closes gh-26105
2021-04-14 10:06:39 +02:00
Stephane Nicoll 1855f96d07 Polish "Document spring.config.additional-location should be used early"
See gh-26085
2021-04-14 10:06:06 +02:00
Shannon Carey b0b1c04fc4 Document spring.config.additional-location should be used early
See gh-26085
2021-04-14 10:03:56 +02:00
Andy Wilkinson 2e25a256d5 Allow the auto-configured RabbitMQ ConnectionFactory to be customized
Closes gh-6719
2021-04-13 18:14:38 +01:00
Andy Wilkinson 04e441f468 Add a config prop for the embedded database connection
Previously, the embedded database connection that would be used
could only be controlled via the classpath. If multiple embedded
database dependencies were present, it wasn't possible to control
the one that the auto-configured would use. It also wasn't possible
to disable auto-configuration of an embedded database.

This commit introduces a new configuration property,
spring.datasource.embedded-database-connection. It can be set to
one of the values of the EmbeddedDatabaseConnection enum to control
the auto-configuration of an embedded database. Setting it to none
will disable the auto-configuration and ensure that an external
database is used instead.

Closes gh-23412
2021-04-13 12:48:46 +01:00
Andy Wilkinson 713c0fce7c Auto-configure H2C when HTTP/2 is enabled and SSL is disabled 2021-04-12 17:16:14 +01:00
Andy Wilkinson c4750fd0ff Support Gradle 7 and raise minimum supported version to 6.8
Closes gh-26026
2021-04-12 15:20:32 +01:00
Stephane Nicoll 8506a00071 Merge branch '2.4.x'
Closes gh-26025
2021-04-12 14:19:53 +02:00
Stephane Nicoll fd6ad5b889 Merge branch '2.3.x' into 2.4.x
Closes gh-26024
2021-04-12 14:19:41 +02:00
Stephane Nicoll 7286c33f53 Document default behaviour of DataJpaTest#showSql
Closes gh-25843
2021-04-12 14:14:36 +02:00
izeye 4987880afa Polish
See gh-25980
2021-04-12 08:37:02 +02:00
Andy Wilkinson 0a8da4fd7d Polish "Provide health for an AbstractRoutingDataSource's resolved targets"
See gh-25708
2021-04-10 11:12:10 +01:00
Phillip Webb f03f74ff0a Add Spring Data Repository metrics support
Add support for Spring Data Repository metrics by integrating with
Spring Data's new `RepositoryMethodInvocationListener` support.

Closes gh-22217
2021-04-09 23:49:25 -07:00
Phillip Webb 1893f935b4 Rework 'Supported Metrics' reference documentation
Rework the 'Supported Metrics' documentation to improve consistency
access subsections. Details about the `@Timer` annotation have been
pulled into a new section so that they can be referenced rather than
repeated.

See gh-22217
2021-04-09 23:46:33 -07:00
Phillip Webb efba7076ba Fix title case capitalization 2021-04-09 23:38:12 -07:00
dreis2211 21ece1ea30 Remove Gradle 5.6.x support from docs
See gh-25981
2021-04-09 14:44:35 +01:00
Stephane Nicoll 719d10b6e7 Merge branch '2.4.x'
Closes gh-25979
2021-04-09 14:19:21 +02:00
dreis2211 afd4b582ed Fix typos in docs
See gh-25947
2021-04-09 14:18:53 +02:00
Stephane Nicoll d50e581403 Start building against Micrometer 1.7.0-RC1 snapshots
See gh-25934
2021-04-09 13:44:32 +02:00
Phillip Webb 7a636e5c08 Update @Timed WebFlux documentation
Closes gh-23112
2021-04-08 23:15:44 -07:00
Phillip Webb 7056a95ffc Polish 'Support system-dependent path separators'
See gh-24490
2021-04-08 20:49:02 -07:00
Brian Clozel 0929048bb4 Link build tools docs version properties section
Closes gh-25935
2021-04-08 18:18:11 +02:00
Phillip Webb 4b05dbf4a2 Polish 2021-04-06 14:59:13 -07:00
Andy Wilkinson 73e1dd8728 Polish "Auto-configure Mongo metrics"
See gh-23990
2021-04-06 18:15:09 +01:00
bono007 81c18214d1 Auto-configure Mongo metrics
See gh-23990
2021-04-06 16:58:39 +01:00
Stephane Nicoll b11602aeaa Polish "Add Quartz actuator endpoint"
This commit reworks the initial proposal so that jobs and triggers are
treated as first class concepts.

`/actuator/quartz` now returns the group names for jobs and triggers.

`actuator/quartz/jobs` returns the job names, keyed by the available
group names, while `/actuator/quartz/triggers` does the same for
triggers.

`/actuator/jobs/{groupName}` provides an overview of a job group. It
provides a map of job names with the class name of the job.
implementation

`/actuator/triggers/{groupName}` provides an overview of a trigger
group. There are five supported trigger implementations: cron, simple,
daily time interval, calendar interval, and custom for any other
implementation. Given that each implementation has specific settings,
triggers are split in five objects.

`/actuator/jobs/{groupName}/{jobName}` provides the full details of a
particular job. This includes a sanitized data map and a list of
triggers ordered by next fire time.

`/actuator/triggers/{groupName}/{triggerName}` provides the full details
of a particular trigger. This includes the state, its type, and a
dedicate object containing implementation-specific settings.

See gh-10364
2021-04-06 12:13:28 +02:00
Stephane Nicoll d578e20b2d Merge branch '2.4.x'
Closes gh-25883
2021-04-05 09:10:56 +02:00
Tommy Ludwig 3746385f98 Polish HealthIndicators table in docs
`=======` was showing up in the header of the table, which should not
be there.

See gh-25882
2021-04-05 09:10:25 +02:00
Stephane Nicoll dd916f908f Merge branch '2.4.x'
Closes gh-25880
2021-04-04 11:19:13 +02:00
Brian Clozel 72a1eb6384 Allow to manually tag request metrics with exceptions
Prior to this commit, some exceptions handled at the controller or
handler function level would:

* not bubble up to the Spring Boot error handling support
* not be tagged as part of the request metrics

This situation is inconsistent because in general, exceptions handled at
the controller level can be considered as expected behavior.
Also, depending on how the exception is handled, the request metrics
might not be tagged with the exception.
This will be reconsidered in gh-23795.

This commit prepares a transition to the new situation. Developers can
now opt-in and set the handled exception as a request attribute. This
well-known attribute will be later read by the metrics support and used
for tagging the request metrics with the exception provided.

This mechanism is automatically used by the error handling support in
Spring Boot.

Closes gh-24028
2021-04-01 21:09:46 +02:00
Andy Wilkinson 9b65409e23 Generalize database initialization detection and include R2DBC
Closes gh-25818
2021-03-29 20:07:54 +01:00
Andy Wilkinson e49a88cb9b Auto-configure script-based R2DBC database initialization
See gh-24741
2021-03-29 12:01:19 +01:00
Andy Wilkinson 90b4ced7a6 Move DataSource init auto-config out of DataSourceAutoConfiguration
Previously, the auto-configuration for DataSource initialization and
the properties used to configure it were part of the general
DataSource auto-configuration and properties.

This commit moves the auto-configuration of DataSource initialization
out into a separate top-level auto-configuration class. Similarly,
the properties for configuring DataSource initialization have been
moved from `spring.datasource.*` into `spring.sql.init.*`.

The old initialization-related `spring.datasource.*` properties have
been deprecated but can still be used. When they are used, they new,
separate initialization auto-configuration will back off. In other
words, the initialization related `spring.datasource.*` properties
and the `spring.sql.init.*` properties cannot be used in combination.

Closes gh-25323
2021-03-24 14:57:29 +00:00
Andy Wilkinson 5dee68c925 Move script-based DataSource initializer into spring-boot
Closes gh-25487
Closes gh-25756
2021-03-22 20:14:30 +00:00
Andy Wilkinson fb670ee654 Drop support for Gradle 5.6.x
Closes gh-24225
2021-03-19 17:30:27 +00:00
Phillip Webb bb38ee38a6 Fix package tangle and polish prefix support
Polish the prefix support introduced in commit a8592f36d4 and fix a
package tangle between `boot.context.properties.source` and `boot.env`.

The `Prefix` interface has now been moved into a new default method on
`OriginLookup`.

See gh-3450
2021-03-18 14:49:52 -07:00
Tommy Ludwig 8eb73bcf01 Support sending metrics to InfluxDB v2
See gh-25721
2021-03-17 15:14:43 +01:00
Stephane Nicoll eb406867ea Polish "Upgrade to Micrometer 1.7.0-M1"
See gh-25707
2021-03-17 11:28:52 +01:00
Stephane Nicoll 4fcbfd3e84 Merge branch '2.4.x'
Closes gh-25645
2021-03-15 16:09:05 +01:00
Stephane Nicoll 6b9032b4d3 Document that Java 16 is supported
Closes gh-25527
2021-03-15 16:08:56 +01:00
Stephane Nicoll ed39075177 Merge branch '2.4.x'
Closes gh-25644
2021-03-15 14:25:49 +01:00
Stephane Nicoll 9aa1ce235f Document DataSource implementations supported by DataSourceBuilder
Closes gh-25333
2021-03-15 14:25:22 +01:00
Stephane Nicoll 9b0cdac97a Add support for external configuration for Cassandra
Closes gh-24065
2021-03-15 10:44:13 +01:00
Phillip Webb bea307b115 Extract code samples from docs
See gh-6313
2021-03-12 17:49:17 -08:00
Phillip Webb 08c4d03649 Fix LocalCacheVerifier include tags
Fixes gh-25567
2021-03-11 16:26:53 -08:00
Phillip Webb 05cf7fbb04 Use new backend features for extracted samples
Update extracted samples to make use of code folding and chomping.

See gh-6313
2021-03-09 11:55:23 -08:00
Andy Wilkinson ed72bca6c8 Provide more pluggable way to indicate DataSource init dependencies
Closes gh-17619
Closes gh-25559
2021-03-09 13:55:48 +00:00
Andy Wilkinson 99b7d29c2c Merge branch '2.4.x' 2021-03-09 11:12:07 +00:00
Andy Wilkinson 9be36f3a72 Merge branch '2.3.x' into 2.4.x 2021-03-09 11:11:46 +00:00
Phillip Webb 6e5c510e0a Migrate to asciidoctor-spring-backends
Migrate to the snapshot version of asciidoctor-spring-backends.

See gh-25553
2021-03-08 22:07:17 -08:00
Phillip Webb 3bb9b2300e Polish asciidoc markup 2021-03-08 22:03:35 -08:00
Stephane Nicoll bb0f43cf07 Allow JMX endpoint ObjectNames to be customized
Closes gh-25317
2021-03-05 16:19:19 +01:00
Andy Wilkinson 006cb643ea Merge branch '2.4.x'
Closes gh-25514
2021-03-05 14:16:27 +00:00
Andy Wilkinson 2f95c1e2c8 Merge branch '2.3.x' into 2.4.x
Closes gh-25513
2021-03-05 14:16:07 +00:00
Andy Wilkinson 22b73f3020 Polish "Improve documentaion of Mockito test execution listeners"
See gh-25375
2021-03-05 14:14:36 +00:00
cdalexndr 72562e0fd4 Improve documentaion of Mockito test execution listeners
See gh-25375
2021-03-05 12:49:18 +00:00
Andy Wilkinson 2cffbc90cb Merge branch '2.4.x'
Closes gh-25511
2021-03-05 11:03:41 +00:00
Andy Wilkinson 836ad76df1 Merge branch '2.3.x' into 2.4.x
Closes gh-25510
2021-03-05 11:03:08 +00:00
Andy Wilkinson 92133d47d0 Polish "Make link to Actuator API docs more prominent"
See gh-25486
2021-03-05 10:58:47 +00:00
cdalexndr 5f4e1b747e Make link to Actuator API docs more prominent
See gh-25486
2021-03-05 10:57:59 +00:00
Madhura Bhave 37dcb90876 Merge branch '2.4.x'
Closes gh-25502
2021-03-04 14:48:11 -08:00
Madhura Bhave ae630e03ce Warn against using multi-document files with TestPropertySource
Closes gh-24945
2021-03-04 14:46:59 -08:00
Madhura Bhave e1904fb72f Merge branch '2.4.x'
Closes gh-25500
2021-03-04 13:04:18 -08:00
Madhura Bhave cfac223cff Document configtree support for Docker secrets
Closes gh-25095
2021-03-04 13:02:28 -08:00
Stephane Nicoll 9db78022bd Merge branch '2.4.x'
Closes gh-25464
2021-03-01 10:45:16 +01:00
Stephane Nicoll 63cca9b8c6 Polish "Document precedence between properties and yaml"
See gh-25300
2021-03-01 10:44:43 +01:00
Robert Smith 20ed8c2ec3 Document precedence between properties and yaml
See gh-25300
2021-03-01 10:39:34 +01:00
izeye c823f44e76 Polish
See gh-25451
2021-02-27 11:22:05 +01:00
Andy Wilkinson 9713bfc765 Enable the logging shutdown hook by default
This commit updates LoggingApplicationListener to register the logging
shutdown hook by default.

The hook is detrimental in a war deployment as it may pin parts of an
application in memory after it has been undeployed. For this reason,
the hook is still disabled by default in war deployments. This is
achieved by setting an attribute on the servlet context in
SpringBootServletInitializer that is then consumed via the Environment
by LoggingApplicationListener.

Closes gh-25046
2021-02-26 14:00:08 +00:00
Madhura Bhave a8592f36d4 Add prefix support for property source
We configure the `SystemEnvironmentPropertySource` as a `Prefixed` property
source. When adapting this to a `ConfigurationPropertySource, a
`PrefixedConfigurationPropertySource` will be created for it.
A `PrefixedConfigurationPropertySource` will resolve property
such as `foo.bar` to `my.foo.bar` for a prefix of `my`.

Closes gh-3450
2021-02-25 12:53:34 -08:00
Stephane Nicoll 9e3cfc5d7a Merge branch '2.4.x'
Closes gh-25432
2021-02-25 15:58:51 +01:00
John Blum cec4d45cf6 Fix grammatical error in documentation
See gh-25411
2021-02-25 15:57:56 +01:00
Andy Wilkinson f09630f73c Allow additional keys to be configured for value sanitization
Closes gh-25384
2021-02-24 19:28:29 +00:00
Andy Wilkinson 10ef991e1d Sanitize sensitive portion of the value of url and urls keys
Closes gh-25387
2021-02-24 14:42:25 +00:00
Stephane Nicoll d9dcfeba5c Polish "Add more customization options for InfluxDB"
See gh-25319
2021-02-23 11:35:15 +01:00
Stephane Nicoll 808e58265f Merge branch '2.4.x'
Closes gh-25372
2021-02-19 12:50:08 +01:00
Stephane Nicoll 9e6302ee6a Merge branch '2.3.x' into 2.4.x
Closes gh-25371
2021-02-19 12:49:40 +01:00
Tommy Ludwig bd2a890899 Polish HTTP client metrics documentation wording
See gh-25353
2021-02-19 12:48:56 +01:00
Phillip Webb a1dc107144 Update copyright year of changed files 2021-02-18 16:23:56 -08:00
Andy Wilkinson df5f59127a Support Jetty 10
Closes gh-24886
2021-02-17 17:49:59 +00:00
Madhura Bhave d69565cf3e Merge branch '2.4.x'
Closes gh-25346
2021-02-17 09:45:26 -08:00
Madhura Bhave 52a15647a9 Polish "Remove old documentation relating to yaml and profiles"
See gh-24620
2021-02-17 09:43:44 -08:00
Ramiro Aparicio 93f822e7b6 Remove old documentation relating to yaml and profiles
See gh-24620
2021-02-17 09:43:29 -08:00
Andy Wilkinson 2f83a6714b Rework DataSource initialization
Previously, DataSource initialization was triggered via a
BeanPostProcessor or a schema created event from JPA. This caused
numerous problems with circular dependencies, bean lifecycle, etc and
added significant complexity.

This commit reworks DataSource initialization to remove the use of a
BeanPostProcessor entirely. In its place, DataSource initialization is
now driven by an InitializingBean with dependency relationships
between beans ensuring that initialization has been performed before
the DataSource is used. This aligns with the approach that's worked
well with Flyway and Liquibase.

More changes are planned to further simplify DataSource initialization.
The changes in this commit are a foundation for those changes. Any new
public API in this commit is highly likely to change before the next
GA.

Fixes gh-13042
Fixes gh-23736
2021-02-17 12:10:22 +00:00
Stephane Nicoll 9bc4f8ede1 Polish "Group jdbc-related batch properties beneath spring.batch.jdbc"
See gh-25316
2021-02-17 11:29:35 +01:00
Stephane Nicoll b50fb824a3 Merge branch '2.4.x'
Closes gh-25298
2021-02-15 14:16:01 +01:00
Stephane Nicoll a9ff33f74f Merge branch '2.3.x' into 2.4.x
Closes gh-25297
2021-02-15 14:15:42 +01:00
Stephane Nicoll 569002e917 Polish "Document Kafka Streams metrics support"
See gh-25272
2021-02-15 14:11:34 +01:00
izeye dff4ca2293 Document Kafka Streams metrics support
See gh-25272
2021-02-15 14:07:39 +01:00
Stephane Nicoll 8c0c30e7a8 Polish "Add support to auto-configure javax.jms.ExceptionListener"
See gh-25278
2021-02-15 13:58:25 +01:00
Stephane Nicoll ca9b583c7d Merge branch '2.4.x'
Closes gh-25271
2021-02-14 09:37:49 +01:00
izeye f48893def5 Polish 2021-02-14 09:34:30 +01:00
Madhura Bhave c05cb21ab7 Add a property to disable the `/actuator` discovery page
Closes gh-24693
2021-02-09 11:36:29 -08:00
Stephane Nicoll dca643500a Polish "Make Scheduler consistent for Spring Integration"
See gh-25109
2021-02-09 17:06:43 +01:00
Artem Bilan c5491cfdd7 Make Scheduler consistent for Spring Integration
Currently Spring Integration creates its own `TaskScheduler` bean if one
does not exist in the context yet. When we add `@EnableScheduling`,
Spring Boot auto-configures one for us, but this one comes with slightly
different options than the default in Spring Integration.

This commit makes sure that Spring Integration reuses the
auto-configured TaskScheduler if possible, regardless of the user
opting-in for `@EnabledScheduling`.

See gh-25109
2021-02-09 17:06:43 +01:00
Andy Wilkinson 6521d39867 Merge branch '2.4.x'
Closes gh-25143
2021-02-09 14:12:36 +00:00
Andy Wilkinson caa9249987 Merge branch '2.3.x' into 2.4.x
Closes gh-25142
2021-02-09 14:11:59 +00:00
Andy Wilkinson 7898b6afb0 Remove duplicate publication from spring-boot-docs
Fixes gh-25132
2021-02-09 14:10:58 +00:00
Stephane Nicoll a9a8d3a167 Merge branch '2.4.x'
Closes gh-25137
2021-02-09 09:49:59 +01:00
izeye 63ee99bf75 Polish
See gh-25093
2021-02-09 09:48:35 +01:00
Stephane Nicoll ee59f644ed Merge branch '2.4.x'
Closes gh-25136
2021-02-09 09:45:37 +01:00
Stephane Nicoll b2818680fd Polish "Clarify usage of BufferingApplicationStartup"
See gh-25075
2021-02-09 09:44:19 +01:00
Oleg Sukhov 853dbc3de3 Clarify usage of BufferingApplicationStartup
See gh-25075
2021-02-09 09:21:52 +01:00
Phillip Webb 23ebf017c0 Extract code samples from docs
See gh-6313
2021-02-04 15:55:35 -08:00
Phillip Webb 0e326d6b0f Extract some code samples from docs
See gh-6313
2021-02-03 18:10:44 -08:00
Phillip Webb e0392c4558 Add additional dependencies for example code
Add additional dependencies useful for the example code.

See gh-6313
2021-02-03 17:53:52 -08:00
Phillip Webb 9f6f2d36df Polish documented application logged output
Update the documented application output based on the latest version.
2021-02-03 17:53:52 -08:00
Phillip Webb b2a51e4504 Polish asciidoctor formatting 2021-02-03 17:47:36 -08:00
Phillip Webb ae1be76cce Add pending-extract attribute to source
Add `pending-extract=true` to source blocks to help us identify
those that need to be extracted to a real source file.

See gh-6313
2021-02-03 17:45:40 -08:00
Phillip Webb 073f8c4b23 Polish spring-boot-docs
See gh-25089
2021-02-03 16:25:11 -08:00
Phillip Webb 2a85427324 Refine spring-boot-docs package restructure
Refine the package restructure started in 91ccc23462 to help provide
a solid foundation for code snippets. This commit renames many of the
classes so that they no longer end in `Example`. It also removes some
of the inner types that were previously used. Many tag comments have
also been moved to ensure that `import` statements are available in
the docs.

Closes gh-25089
2021-02-03 15:47:05 -08:00
Phillip Webb 91ccc23462 Restructure spring-boot-docs packages
Restructure the packages in `spring-boot-docs` so that they mirror
the documentation sections. There are now three main packages:
`springbootfeatures`, `productionreadyfeatures` and `howto`. Each
of the main packages has a subpackage named after the section headings.

Example code now uses consistent `// tag::` names and imports are
applied using `[tag=*]` whenever possible.

Test snippets have been moved to `src/main/java` so that only a single
import attribute needs to be defined.

Closes gh-25089
2021-02-02 17:09:45 -08:00
Andy Wilkinson db781a0d84 Merge branch '2.4.x'
See gh-25077
2021-02-02 15:14:18 +00:00
Andy Wilkinson 788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson 67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb d8b6960997 Merge branch '2.4.x'
Closes gh-25077
2021-02-01 16:08:57 -08:00
Phillip Webb 257608a3a3 Merge branch '2.3.x' into 2.4.x
Closes gh-25076
2021-02-01 16:03:43 -08:00
Phillip Webb 939b5dfc26 Add junit-platform-launcher dependency
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.

Closes gh-25074
2021-02-01 15:31:28 -08:00
Madhura Bhave c73e3cc2dc Update documentation for layered wars
Closes gh-22821
Closes gh-22195
2021-02-01 14:43:43 -08:00
Phillip Webb 0104ee677e Merge branch '2.4.x'
Closes gh-25067
2021-01-30 17:58:05 -08:00
Phillip Webb 57f1f17320 Merge branch '2.3.x' into 2.4.x
Closes gh-25066
2021-01-30 17:57:53 -08:00
Phillip Webb 187258aa6a Fix classpath.idx format documentation
Since 2.3.8 and 2.4.2 the format includes the directory.

Closes gh-24856
2021-01-30 17:56:09 -08:00
Phillip Webb d6eb1eb5ae Merge branch '2.4.x'
Closes gh-25065
2021-01-30 17:46:25 -08:00
Phillip Webb 9ac5151932 Merge branch '2.3.x' into 2.4.x
Closes gh-25064
2021-01-30 17:46:10 -08:00
Phillip Webb 19c5864d2c Clarify square bracket map binding notation
Update reference docs to make it clearer when the square bracket map
binding notation should be used.

Closes gh-23390
2021-01-30 17:42:49 -08:00
Phillip Webb 99d400f302 Merge branch '2.4.x'
Closes gh-25062
2021-01-30 17:04:24 -08:00
Phillip Webb d7c44e4503 Merge branch '2.3.x' into 2.4.x
Closes gh-25061
2021-01-30 17:04:10 -08:00
Phillip Webb 549d4f7fbe Document that Spring MVC has own ConversionService
Update documentation to make it clearer that Spring MVC does not use the
`ApplicationConversionService` unless configured explicitly.

Closes gh-22718
2021-01-30 17:03:55 -08:00
Andy Wilkinson 82b90d5749 Merge branch '2.4.x'
Closes gh-25052
2021-01-29 09:07:40 +00:00
Andy Wilkinson a3058200cb Merge branch '2.3.x' into 2.4.x
Closes gh-25050
2021-01-29 09:06:42 +00:00
dreis2211 4940694db2 Fix duplicate anchor id
See gh-25048
2021-01-29 09:06:06 +00:00
Phillip Webb f6097e7da4 Merge branch '2.4.x'
Closes gh-25045
2021-01-28 19:29:14 -08:00
Phillip Webb 2d056525d8 Merge branch '2.3.x' into 2.4.x
Closes gh-25044
2021-01-28 19:28:56 -08:00
Phillip Webb c03d8773e7 Improve logging.register-shutdown-hook docs
Update the "Logging" reference documentation with a section about
shutting down the logging system.

Closes gh-24507
2021-01-28 19:26:18 -08:00
Phillip Webb 479180fdf9 Merge branch '2.4.x'
Closes gh-25041
2021-01-28 18:49:04 -08:00
Phillip Webb c86ee4c851 Merge branch '2.3.x' into 2.4.x
Closes gh-25040
2021-01-28 18:48:51 -08:00
Phillip Webb 5b2d1f19a0 Polish 'Add note about exploded jars and banner properties'
See gh-24982
2021-01-28 18:48:14 -08:00
Robert Smith 33c038199d Add note about exploded jars and banner properties
Add a note to the "Customizing the Banner" explaining that you need
to be using the `JarLauncher` to use the `application.*` properties.

See gh-24982
2021-01-28 18:48:11 -08:00
Phillip Webb 802da9dc87 Merge branch '2.4.x'
Closes gh-25039
2021-01-28 18:01:06 -08:00
Phillip Webb 53f1aab833 Merge branch '2.3.x' into 2.4.x
Closes gh-25038
2021-01-28 18:00:42 -08:00
Phillip Webb 60bb33f231 Polish 'Add a tip about actuator endpoints'
See gh-24336
2021-01-28 17:55:09 -08:00
Wesley Ugang 6ced1d7f4e Add a tip about actuator endpoints
Update the "Externalized Configuration" section with a tip that about
the actuator `env` and `configprops` endpoints.

See gh-24336
2021-01-28 17:53:04 -08:00
Hatef Palizgar 53c1e79810 Change info endpoint to be secure and unexposed by default
See gh-24715
2021-01-21 13:54:59 -08:00
dreis2211 d4eccb7715 Upgrade to Groovy 3.0.7
See gh-24946
2021-01-21 14:32:42 +00:00
Stephane Nicoll 012a199773 Remove Spring Data Solr support
In preparation to the upgrade to Spring Data 2021.0, this commit removes
auto-configuration for Spring Data Solr.

Closes gh-24939
2021-01-20 15:03:42 +01:00
Stephane Nicoll 85729d2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-24943
2021-01-20 13:57:18 +01:00
Stephane Nicoll 10b4cb8cb5 Deprecate Spring Data Solr support
Closes gh-24942
2021-01-20 13:56:50 +01:00
Stephane Nicoll 600be08225 Merge branch '2.4.x'
Closes gh-24855
2021-01-15 16:51:27 +01:00
Stephane Nicoll 7ec7569939 Merge branch '2.3.x' into 2.4.x
Closes gh-24854
2021-01-15 16:51:10 +01:00
Stephane Nicoll b3ab77a5c3 Move Spring Boot version to main index in reference guide
Closes gh-24848
2021-01-15 16:50:45 +01:00
Stephane Nicoll 1a2a3d6598 Merge branch '2.4.x' 2021-01-15 14:37:25 +01:00
Stephane Nicoll e8ae18ae11 Polish
See gh-24837
2021-01-15 14:36:53 +01:00
Stephane Nicoll a18f01addf Remove bitronix support
See gh-24806
2021-01-15 14:14:27 +01:00
Brian Clozel 4dd60684c9 Merge branch '2.4.x'
Closes gh-24844
2021-01-14 18:36:31 +01:00
Brian Clozel 6f51831001 Fix docs on probe state during graceful shutdown
This commit improves the "Application lifefycle and Probes states"
section and underlines the difference between `AvailabilityState` and
the availability of Probes over HTTP.

Closes gh-24843
2021-01-14 18:30:15 +01:00
Stephane Nicoll 0897af0dfa Add customizer for jOOQ's configuration
This commit adds a customizer hook point for jOOQ's configuration. When
such a bean is present, it is invoked with the auto-configuration
`Configuration`. This effectively supersedes checking for a number of
jOOQ `*Provider`beans. The existing beans are still honoured, in a
deprecated fashion.

Closes gh-24732
2021-01-11 14:16:34 +01:00
Stephane Nicoll 1d30a4716e Merge branch '2.4.x'
Closes gh-24708
2021-01-08 15:54:36 +01:00
Stephane Nicoll b8a1869569 Merge branch '2.3.x' into 2.4.x
Closes gh-24707
2021-01-08 15:53:53 +01:00
Stephane Nicoll 826d79be3e Clarify behaviour of WebServerFactory in reference guide
Closes gh-24705
2021-01-08 15:50:16 +01:00
Phillip Webb 42e649debe Merge branch '2.4.x'
Closes gh-24682
2021-01-06 16:47:46 -08:00
Phillip Webb 04616a01cf Merge branch '2.3.x' into 2.4.x
Closes gh-24681
2021-01-06 16:47:24 -08:00
Phillip Webb ef09982b39 Merge branch '2.2.x' into 2.3.x
Closes gh-24680
2021-01-06 16:46:50 -08:00
Phillip Webb 25033ee5e7 Migrate away from pivotal-legacy/homebrew-tap
Update reference documentation to the new spring-io/homebrew-tap repo.

Closes gh-24659
2021-01-06 16:45:10 -08:00
Stephane Nicoll 2547a9e255 Merge branch '2.4.x'
See gh-24655
2021-01-06 14:24:34 +01:00
Stephane Nicoll c014bb9880 Merge branch '2.3.x' into 2.4.x
See gh-24647
2021-01-06 14:24:13 +01:00
Stephane Nicoll 67d1f355d7 Fix Nullable reference
See gh-24647
2021-01-06 14:23:38 +01:00
Stephane Nicoll b3278f459e Merge branch '2.4.x'
See gh-24655
2021-01-06 08:59:14 +01:00
Stephane Nicoll 4e6f15a466 Merge branch '2.3.x' into 2.4.x
See gh-24647
2021-01-06 08:58:48 +01:00
Stephane Nicoll 2bd78355dc Reference javax.annotation.Nonnull support in reference guide
See gh-24647
2021-01-06 08:58:13 +01:00
Andy Wilkinson 77652961cd Merge branch '2.4.x'
Closes gh-24650
2021-01-05 17:13:45 +00:00
Andy Wilkinson 89f29c933f Merge branch '2.3.x' into 2.4.x
Closes gh-24649
2021-01-05 17:13:30 +00:00
dreis2211 fe3217d2c4 Exclude starters from Javadoc aggregation
See gh-24648
2021-01-05 17:12:39 +00:00
Stephane Nicoll 63444ae957 Merge branch '2.4.x'
Closes gh-24627
2021-01-01 09:18:31 +01:00
Stephane Nicoll 052565ef2b Merge branch '2.3.x' into 2.4.x
Closes gh-24626
2021-01-01 09:18:13 +01:00
dreis2211 261b7a5b18 Update copyrights to 2021
See gh-24625
2021-01-01 09:17:13 +01:00
Stephane Nicoll 1a2577a07e Fix sample formatting 2020-12-23 17:19:18 +01:00
Stephane Nicoll 1fd17cf641 Add support for Elasticsearch sniffer
Closes gh-24174
2020-12-23 17:11:40 +01:00
Stephane Nicoll 1e8d5c37ed Merge branch '2.4.x'
Closes gh-24607
2020-12-23 16:09:13 +01:00
izeye 5e3f618f9d Polish
See gh-24604
2020-12-23 16:08:21 +01:00
Stephane Nicoll e3d7ab0e3b Merge branch '2.3.x' into 2.4.x 2020-12-23 16:08:08 +01:00
Stephane Nicoll d0a1c49873 Polish
See gh-24604
2020-12-23 16:07:27 +01:00
Madhura Bhave b29ac37db6 Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24596
2020-12-22 12:18:47 -08:00
Madhura Bhave d36c950e33 Merge branch '2.4.x'
Closes gh-24595
2020-12-22 12:14:16 -08:00
Madhura Bhave a0afec120d Add docs about using InMemoryOAuth2AuthorizedClientService
Closes gh-24313
2020-12-22 12:13:17 -08:00
Madhura Bhave 467f853641 Merge branch '2.4.x'
Closes gh-24593
2020-12-22 11:17:54 -08:00
Madhura Bhave a714ba44ea Update documentation containing examples of WebSecurityConfigurerAdapter
Closes gh-24551
2020-12-22 11:17:30 -08:00
Stephane Nicoll 1f71927a9f Merge branch '2.3.x' into 2.4.x
Closes gh-24587
2020-12-22 09:45:42 +01:00
Stephane Nicoll 9e5a6c5228 Harmonize references to ActiveMQ Artemis
Closes gh-24586
2020-12-22 09:44:49 +01:00
Justin Bertram 99b43cb690 Allow to configure ActiveMQ Artemis with a broker url
See gh-24302
2020-12-21 17:32:49 +01:00
Madhura Bhave 13a06e4eca Merge branch '2.4.x' 2020-12-18 18:03:45 -08:00
Madhura Bhave af67e6fa54 Merge branch '2.3.x' into 2.4.x 2020-12-18 18:03:22 -08:00
Madhura Bhave b82f5a408a Add a note about disabling git info
See gh-24205
2020-12-18 18:02:27 -08:00
Madhura Bhave 15a56f81df Merge branch '2.4.x'
Closes gh-24573
2020-12-18 17:27:13 -08:00
Madhura Bhave f9d1a4526c Merge branch '2.3.x' into 2.4.x
Closes gh-24572
2020-12-18 17:26:44 -08:00
Madhura Bhave a5c8b84511 Update version of git-properties plugin in the docs
Closes gh-24567
2020-12-18 17:25:26 -08:00
Madhura Bhave acbe18cf85 Merge branch '2.4.x'
Closes gh-24571
2020-12-18 17:15:26 -08:00
Madhura Bhave c231f3da10 Merge branch '2.3.x' into 2.4.x
Closes gh-24570
2020-12-18 17:15:01 -08:00
Madhura Bhave 302ba77812 Improve documentation regarding git commit info
Closes gh-24205
2020-12-18 17:13:30 -08:00
Phillip Webb 07348066e3 Merge branch '2.4.x' 2020-12-18 15:10:00 -08:00
Phillip Webb f568aa489c Fixup title anchors 2020-12-18 15:06:11 -08:00
Madhura Bhave 9aa1b528df Merge branch '2.4.x'
Closes gh-24566
2020-12-18 14:17:12 -08:00
Madhura Bhave 01537bc54f Merge branch '2.3.x' into 2.4.x
Closes gh-24565
2020-12-18 14:16:45 -08:00
Madhura Bhave c9a09cf6a9 Clarify when SpEL expressions in application properties are evaluated
Closes gh-24531
2020-12-18 14:15:27 -08:00
Madhura Bhave 86d64c727d Merge branch '2.4.x'
Closes gh-24564
2020-12-18 14:05:49 -08:00
Madhura Bhave 55d9951d90 Merge branch '2.3.x' into 2.4.x
Closes gh-24563
2020-12-18 14:05:20 -08:00
Madhura Bhave 1db271c2c5 Reorder documentation about building images
Closes gh-24560
2020-12-18 14:02:29 -08:00
Andy Wilkinson 4040105629 Merge branch '2.4.x'
Closes gh-24519
2020-12-15 17:22:01 +00:00
Andy Wilkinson a67edfbeb7 Merge branch '2.3.x' into 2.4.x
Closes gh-24518
2020-12-15 17:21:39 +00:00
Andy Wilkinson 76198f9a8d Include properties from test-autoconfigure in config props appendix
Closes gh-24486
2020-12-15 17:20:21 +00:00
Andy Wilkinson fb0f27ce2d Move EMFDependsOnPostProcessor into autoconfigure.orm.jpa
Closes gh-24452
2020-12-15 14:20:50 +00:00
Stephane Nicoll 69c6b6b04d Merge branch '2.4.x'
Closes gh-24511
2020-12-15 14:48:38 +01:00
Stephane Nicoll 251e8b2640 Update instruction to add the configuration processor with Maven
Closes gh-24498
2020-12-15 14:48:19 +01:00
Stephane Nicoll f9e44cd774 Merge branch '2.4.x'
Closes gh-24496
2020-12-14 16:20:11 +01:00
Stephane Nicoll 96510156ae Merge branch '2.3.x' into 2.4.x
Closes gh-24495
2020-12-14 16:19:50 +01:00
Stephane Nicoll 26e7e61919 Merge branch '2.2.x' into 2.3.x
Closes gh-24494
2020-12-14 16:19:23 +01:00
Stephane Nicoll 60f526add0 Remove links to Jetty API and documentation
This commit removes links to Jetty API and documentation as those links
are breaking every time the Jetty team releases a new version

See https://github.com/eclipse/jetty.project/issues/4546

Closes gh-24493
2020-12-14 16:17:25 +01:00
Stephane Nicoll 08b692581a Prepare 2.4.x branch 2020-12-14 14:22:07 +01:00
izeye 0eae6b4f72 Polish
See gh-24418
2020-12-10 13:53:06 +01:00
Phillip Webb b48f4028a3 Merge branch '2.3.x' 2020-12-08 16:32:45 -08:00
Phillip Webb 30717b6ae3 Merge branch '2.2.x' into 2.3.x 2020-12-08 16:32:26 -08:00