2609 Commits

Author SHA1 Message Date
Phillip Webb
b3a82c9de6 Merge branch '2.5.x' into 2.6.x 2022-02-05 10:16:03 -08:00
Phillip Webb
52f1799c20 Polish formatting 2022-02-05 10:15:43 -08:00
Phillip Webb
05c58a18df Merge branch '2.5.x' into 2.6.x
Closes gh-29657
2022-02-04 19:44:05 -08:00
Phillip Webb
12a33a2eaf Upgrade to spring-asciidoctor-backends 0.0.3
Closes gh-29656
2022-02-04 19:43:47 -08:00
Phillip Webb
50e0e28155 Merge branch '2.5.x' into 2.6.x 2022-02-02 10:37:32 -08:00
Phillip Webb
5975cdc5ed Polish formatting 2022-02-02 10:35:10 -08:00
Stephane Nicoll
d130819fb4 Merge branch '2.5.x' into 2.6.x
Closes gh-29616
2022-02-01 16:35:19 +01:00
Stephane Nicoll
5fe6176966 Polish "Add a note on early init with @ConditionalOnExpression"
See gh-29276
2022-02-01 16:32:27 +01:00
Mihail Cornescu
fce3cd1684 Add a note on early init with @ConditionalOnExpression
See gh-29276
2022-02-01 16:24:13 +01:00
Stephane Nicoll
787a2f3d9b Merge branch '2.5.x' into 2.6.x 2022-01-31 16:44:39 +01:00
Stephane Nicoll
ab0b29cb53 Polish "Make classloader customization easier to discover"
See gh-29438
2022-01-31 16:38:38 +01:00
Andreas Ahlenstorf
96f48db2ab Make classloader customization easier to discover
See gh-29438
2022-01-31 16:28:28 +01:00
Stephane Nicoll
e36a56f014 Merge branch '2.5.x' into 2.6.x
Closes gh-29539
2022-01-24 09:41:35 +01:00
Axel Fontaine
48817587e6 Rename Boxfuse to CloudCaptain
See gh-29523
2022-01-24 09:35:44 +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
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
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
Omkar Shetkar
c19e192acd Fix duplicate "Logging" link
See gh-29380
2022-01-13 15:30:21 +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
izeye
7fbb5749d1 Polish
See gh-29157
2021-12-27 12:01:50 +01: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
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
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
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
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