Commit Graph

50613 Commits

Author SHA1 Message Date
Andy Wilkinson
649117de35 Merge branch '3.0.x' into 3.1.x
Closes gh-38031
2023-10-25 14:08:10 +01:00
Andy Wilkinson
331bf51332 Merge branch '2.7.x' into 3.0.x
Closes gh-38030
2023-10-25 14:07:57 +01:00
Andy Wilkinson
666f68ea60 Document configuration for building images with Colima
Closes gh-34522
2023-10-25 14:07:43 +01:00
Andy Wilkinson
fb1912149e Merge branch '3.1.x'
Closes gh-38028
2023-10-25 12:24:55 +01:00
Andy Wilkinson
581dfbfa33 Merge branch '3.0.x' into 3.1.x
Closes gh-38027
2023-10-25 12:24:42 +01:00
Andy Wilkinson
5b80dd87d3 Merge branch '2.7.x' into 3.0.x
Closes gh-38026
2023-10-25 12:18:41 +01:00
Andy Wilkinson
9a23e13894 Add some documentation for customizing the reactive web server
Closes gh-31917
2023-10-25 12:17:45 +01:00
Andy Wilkinson
6bcd1cf937 Merge branch '3.1.x'
Closes gh-38025
2023-10-25 11:10:35 +01:00
Andy Wilkinson
f8f60d1aae Merge branch '3.0.x' into 3.1.x
Closes gh-38024
2023-10-25 11:10:22 +01:00
Andy Wilkinson
5db85a818e Merge branch '2.7.x' into 3.0.x
Closes gh-38023
2023-10-25 11:09:56 +01:00
Andy Wilkinson
a20f81b995 Mention that classpath.idx is typically generated by build plugins
Closes gh-37125
2023-10-25 11:09:17 +01:00
Andy Wilkinson
edca4901dc Merge branch '3.1.x'
Closes gh-38022
2023-10-25 11:03:36 +01:00
Andy Wilkinson
56d31d47f1 Merge branch '3.0.x' into 3.1.x
Closes gh-38021
2023-10-25 11:03:24 +01:00
Andy Wilkinson
e742321dbb Merge branch '2.7.x' into 3.0.x
Closes gh-38020
2023-10-25 11:02:26 +01:00
Andy Wilkinson
fcdc638336 Mention what to do when use-hal-as-default-json-media-type is false
Closes gh-26814
2023-10-25 11:01:28 +01:00
Andy Wilkinson
4f7e4712dd Merge branch '3.1.x'
Closes gh-38019
2023-10-25 10:45:07 +01:00
Andy Wilkinson
4faabcfcdd Merge branch '3.0.x' into 3.1.x
Closes gh-38018
2023-10-25 10:44:38 +01:00
Andy Wilkinson
b33ee84146 Merge branch '2.7.x' into 3.0.x
Closes gh-38017
2023-10-25 10:44:03 +01:00
Andy Wilkinson
8778884f5d Clarify role of WebMvcRegistrations and WebMvcConfigurer
Closes gh-31232
2023-10-25 10:42:25 +01:00
Andy Wilkinson
e7c3c6e62c Merge branch '3.1.x'
Closes gh-38016
2023-10-25 10:22:05 +01:00
Andy Wilkinson
b764192550 Merge branch '3.0.x' into 3.1.x
Closes gh-38015
2023-10-25 10:21:04 +01:00
Andy Wilkinson
5beed3c673 Merge pull request #38010 from izeye
* gh-38010:
  Add Embedded MongoDB to community starters

Closes gh-38010
2023-10-25 10:20:38 +01:00
Johnny Lim
f16ad50db8 Add Embedded MongoDB to community starters
See gh-38010
2023-10-25 10:20:13 +01:00
Moritz Halbritter
ddf6b3f23b Merge branch '3.1.x'
Closes gh-38014
2023-10-25 10:26:02 +02:00
Moritz Halbritter
73685d1d02 Register required class names for reflection in Testcontainer factory
Closes gh-36606
2023-10-25 10:25:42 +02:00
Phillip Webb
4e7c0737d4 Fix PropertiesLauncher classpath detection without 'loader.path' set
Update `PropertiesLauncher` to restore classpath detection logic applied
when no `loader.path` property is set.

Fixes gh-37992
2023-10-24 17:03:18 -07:00
Moritz Halbritter
c7bae80585 Merge branch '3.1.x'
Closes gh-38004
2023-10-24 14:09:18 +02:00
Moritz Halbritter
6fb127e635 Merge branch '3.0.x' into 3.1.x
Closes gh-38003
2023-10-24 14:08:29 +02:00
Moritz Halbritter
9f6d44202b Merge branch '2.7.x' into 3.0.x
Closes gh-38002
2023-10-24 14:07:15 +02:00
Moritz Halbritter
bf97e6dad8 Ban use of AssertJ assertThatThrownBy
Use assertThatExceptionOfType instead.

Closes gh-37968
2023-10-24 14:06:52 +02:00
Andy Wilkinson
0950d4416a Pass in filter's name when adding to MockMvc
Closes gh-38001
2023-10-24 12:39:42 +01:00
Moritz Halbritter
4c3de96d74 Fix links to Antora based JavaDoc and reference documentation
This introduces two different attributes for, e.g. the Spring Framework
version: the "normal" one, e.g. 6.1.0-SNAPSHOT, and the Antora one,
e.g. 6.1.

Spring Framework's reference documentation is still broken when using
SNAPSHOT versions, see spring-framework/gh-31480.

See gh-38000
2023-10-24 10:31:26 +02:00
Phillip Webb
7bd9989614 Fix merge conflict errors
See gh-37999
2023-10-23 19:40:44 -07:00
Phillip Webb
2ac69160c7 Revert "Allow PemPrivateKeyParser to parse multiple keys"
This reverts commit 32e6ce210e.

Closes gh-37999
2023-10-23 18:32:12 -07:00
Andy Wilkinson
a9469d9c8e Adapt to changes in Framework's internals
See gh-37995
2023-10-23 18:07:38 +01:00
Andy Wilkinson
959311bf0e Start building against Spring Framework 6.1.0 snapshots
See gh-37995
2023-10-23 15:25:13 +01:00
Moritz Halbritter
34ec35f2b6 Merge pull request #37984 from izeye
* pr/37984:
  Polish

Closes gh-37984
2023-10-23 11:17:07 +02:00
Johnny Lim
b5d4983829 Polish
See gh-37984
2023-10-23 11:15:27 +02:00
Moritz Halbritter
6b8c340de0 Merge pull request #37986 from onobc
* pr/37986:
  Fix links in Spring Pulsar section of ref guide

Closes gh-37986
2023-10-23 11:10:59 +02:00
Chris Bono
ddd093f4e2 Fix links in Spring Pulsar section of ref guide
Spring for Apache Pulsar recently moved to Antora docs which in turn
modified the base url slightly. This commmit adjusts for the move.

See gh-37986
2023-10-23 11:06:54 +02:00
Moritz Halbritter
854adba783 Merge pull request #37987 from onobc
* pr/37987:
  Fix links in Spring Kafka section of ref guide

Closes gh-37987
2023-10-23 11:04:15 +02:00
Chris Bono
1571097048 Fix links in Spring Kafka section of ref guide
Spring for Apache Kafka recently moved to Antora docs which in turn
modified the base url slightly. This commmit adjusts for the move.

See gh-37987
2023-10-23 11:03:05 +02:00
Moritz Halbritter
9469327f04 Merge pull request #37975 from sdeleuze
* pr/37975:
  Polish "Add JVM Checkpoint Restore documentation"
  Add JVM Checkpoint Restore documentation

Closes gh-37975
2023-10-23 11:01:48 +02:00
Moritz Halbritter
68d8fa14bf Polish "Add JVM Checkpoint Restore documentation"
See gh-37975
2023-10-23 11:01:25 +02:00
Sébastien Deleuze
e988bf4212 Add JVM Checkpoint Restore documentation
See gh-37975
2023-10-23 11:01:20 +02:00
Moritz Halbritter
b11d06deb1 Merge branch '3.1.x'
Closes gh-37991
2023-10-23 10:42:42 +02:00
Moritz Halbritter
09821feb75 Fix container inspection for Docker Compose >= 2.23.0
Docker Compose starting with 2.23.0 returns truncated ids in the
docker compose ps call. We now do a prefix search if an exact match
isn't found in the docker inspect response.

Closes gh-37982
2023-10-23 10:40:20 +02:00
Phillip Webb
e1bd24695d Try @AssertFileChannelDataBlocksClosed for Windows fix
This updates commit dad5dc6750 to
see if @AssertFileChannelDataBlocksClosed will take care of
closing files.

See gh-7161
2023-10-20 10:05:43 -07:00
Andy Wilkinson
3cfe2360c6 Merge branch '3.1.x'
Closes gh-37980
2023-10-20 16:04:27 +01:00
Andy Wilkinson
955c2bfcdf Merge branch '3.0.x' into 3.1.x
Closes gh-37979
2023-10-20 16:04:12 +01:00