2375 Commits

Author SHA1 Message Date
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