Commit Graph

34626 Commits

Author SHA1 Message Date
Andy Wilkinson
51dc02e37b Merge branch '2.5.x'
See gh-28485
2021-10-29 17:18:52 +01:00
Andy Wilkinson
28d323ee3a Merge branch '2.4.x' into 2.5.x
See gh-28484
2021-10-29 17:18:30 +01:00
Andy Wilkinson
b9e3660833 Revert running tests in parallel
See gh-19876
2021-10-29 17:18:13 +01:00
Andy Wilkinson
875479abeb Merge branch '2.5.x'
Closes gh-28490
2021-10-29 15:52:18 +01:00
Andy Wilkinson
33249e9414 Merge branch '2.4.x' into 2.5.x
Closes gh-28489
2021-10-29 15:52:08 +01:00
Andy Wilkinson
12d8f942be Stop logging to the file used in the generated documentation
Closes gh-28488
2021-10-29 15:51:32 +01:00
Andy Wilkinson
e54b876536 Merge branch '2.5.x'
Closes gh-28487
2021-10-29 15:50:01 +01:00
Andy Wilkinson
5e42f27b36 Merge branch '2.4.x' into 2.5.x
Closes gh-28486
2021-10-29 15:49:49 +01:00
Andy Wilkinson
e4e1958b65 Make Logback fall back to JVM's default charset
The charset "default" is an alias for US-ASCII, not the JVM's default
charset. This commit updates the built-in Logback configuration to
use Charset.defaultCharset().name() in place of "default" in the
Java-based configuration. In the XML-based configuration where
Charset.defaultCharset().name() cannot be called, we emulate its
behaviour [1] by using the file.encoding system property, falling back
to UTF-8 when it's not set.

Fixes gh-27230

[1] 19be6113dd/jdk/src/share/classes/java/nio/charset/Charset.java (L604-L617)
2021-10-29 14:40:05 +01:00
Andy Wilkinson
673b6322e5 Merge branch '2.5.x' 2021-10-29 13:55:36 +01:00
Andy Wilkinson
c7a2d61aee Merge branch '2.4.x'
Closes gh-28485
2021-10-29 13:48:36 +01:00
Andy Wilkinson
7fe6f4887c Merge branch '2.4.x' into 2.5.x
Closes gh-28484
2021-10-29 13:48:23 +01:00
Andy Wilkinson
22d85e6d7b Allow tests to be run in parallel across multiple workers
Closes gh-19876
2021-10-29 12:48:45 +01:00
Andy Wilkinson
ef2bcdd3ed Merge branch '2.5.x'
Closes gh-28483
2021-10-29 11:37:43 +01:00
Andy Wilkinson
07ed7ab944 Merge branch '2.4.x' into 2.5.x
Closes gh-28482
2021-10-29 11:37:33 +01:00
Andy Wilkinson
2462f67be4 Align test for spring.data.mongodb.autoIndexCreation with new default
Closes gh-28481
2021-10-29 11:23:35 +01:00
Andy Wilkinson
c9dd6b7e86 Merge branch '2.5.x'
Closes gh-28480
2021-10-29 11:12:18 +01:00
Andy Wilkinson
ae93bb3a11 Merge branch '2.4.x' into 2.5.x
Closes gh-28479
2021-10-29 11:12:04 +01:00
Andy Wilkinson
10f0017d69 Fix method validation in child contexts
Bean post-processors only apply to the context in which they're
registered. ValidationAutoConfiguration will only auto-configure the
MethodValidationPostProcessor if the post-processor is missing from
the current context and any of its ancestors. If an ancestor context
contains the post-processor it will not be auto-configured and the
descendant context will not have method validation configured.

This commit updates the auto-configuration to limit the search for
an existing MethodValidationPostProcessor bean to the current
context.

Fixes gh-27890
2021-10-29 10:08:57 +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
Andy Wilkinson
025c4c277b Merge pull request #28464 from Buzzardo
* gh-28464:
  Replace "via" with words more suited to an international audience

Closes gh-28464
2021-10-28 17:56:19 +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
7bd00a4df0 Merge branch '2.5.x'
See gh-28474
2021-10-28 17:39:08 +02:00
Stephane Nicoll
282e8ecc1a Merge branch '2.4.x' into 2.5.x
See gh-28473
2021-10-28 17:38:57 +02:00
Stephane Nicoll
a8eed97efd Revert "Add .gitattributes"
See gh-28476
2021-10-28 17:37:47 +02:00
Stephane Nicoll
9241f228d5 Add .gitattributes
Closes gh-28474
2021-10-28 15:31:40 +02:00
Stephane Nicoll
dde385c946 Merge branch '2.5.x' 2021-10-28 15:28:00 +02:00
Stephane Nicoll
66553ac8c7 Add .gitattributes
Closes gh-28473
2021-10-28 15:27:49 +02:00
Stephane Nicoll
94cd2f7ca1 Merge branch '2.4.x' into 2.5.x 2021-10-28 15:24:38 +02:00
Stephane Nicoll
1b3f52d609 Harmonize line endings
See gh-27615
2021-10-28 15:22:57 +02:00
Stephane Nicoll
bcb0d83898 Merge pull request #27615 from Goooler
* pr/27615:
  Polish "Add .gitattributes"
  Add .gitattributes

Closes gh-27615
2021-10-28 15:22:45 +02:00
Stephane Nicoll
497d68acf1 Polish "Add .gitattributes"
See gh-27615
2021-10-28 15:15:14 +02:00
Goooler
8c2dd7c589 Add .gitattributes
See gh-27615
2021-10-28 15:12:53 +02:00
Andy Wilkinson
24ef4e6fb9 Merge branch '2.5.x'
Closes gh-28471
2021-10-28 13:07:22 +01:00
Andy Wilkinson
7fbbb4e08a Merge branch '2.4.x' into 2.5.x
Closes gh-28470
2021-10-28 13:07:07 +01:00
Andy Wilkinson
72f80f3ae6 Upgrade to Testcontainers 1.16.1
Closes gh-28468
2021-10-28 13:06:41 +01:00
Andy Wilkinson
e340429a1a Merge branch '2.5.x'
Closes gh-28469
2021-10-28 12:50:23 +01:00
Andy Wilkinson
b375f9fac0 Ignore parameters when checking if */* is accepted
Previously the parameters were not ignored so */*;q=0.8 was not
identified as accepting */*. As a result, the most recent producible
content type was returned rather than the default.

This commit updates the argument resolver to ignore parameters.
The default content type is now produced in response to a request
that accepts */*, irrespective of its parameters.

Fixes gh-28446
2021-10-28 12:27:34 +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
e4c96b3684 Merge pull request #28448 from ghusta
* pr/28448:
  Polish "Fix description of "logging.logback.rollingpolicy.max-history""
  Fix description of "logging.logback.rollingpolicy.max-history"

Closes gh-28448
2021-10-28 11:51:21 +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
Guillaume Husta
a05b2207f8 Fix description of "logging.logback.rollingpolicy.max-history"
See gh-28448
2021-10-28 11:45:42 +02:00
Stephane Nicoll
9b268cc7f4 Merge branch '2.5.x' 2021-10-28 08:45:43 +02:00
Stephane Nicoll
1b4eb16c83 Upgrade CI to Docker 20.10.10
Closes gh-28457
2021-10-28 08:45:32 +02:00
Stephane Nicoll
281f1d4e99 Upgrade Java 17 version in CI image
Closes gh-28465
2021-10-28 08:44:53 +02:00
Stephane Nicoll
3d8d61de3f Upgrade Java 11 version in CI image
Closes gh-28463
2021-10-28 08:42:59 +02:00
Stephane Nicoll
2c5e20def5 Upgrade Java 8 version in CI image
Closes gh-28461
2021-10-28 08:42:26 +02:00
Stephane Nicoll
37d96a94bf Merge branch '2.4.x' into 2.5.x 2021-10-28 08:41:43 +02:00
Stephane Nicoll
c8154442ec Upgrade CI to Docker 20.10.10
Closes gh-28454
2021-10-28 08:41:34 +02:00