Commit Graph

38335 Commits (b5cebed12045121f77b4d44575d8031eadcfbe26)
 

Author SHA1 Message Date
Phillip Webb bfc703a40d Merge branch '2.6.x' into 2.7.x
Closes gh-31879
2 years ago
Phillip Webb 1e886bd083 Merge pull request #31676 from terminux
* pr/31676:
  Polish "Call the value adapter during NamedContributorsMapAdapter construction"
  Call the value adapter during NamedContributorsMapAdapter construction

Closes gh-31676
2 years ago
Phillip Webb 59c9a9cd8a Polish "Call the value adapter during NamedContributorsMapAdapter construction"
See gh-31676
2 years ago
Guirong Hu c530f12cc3 Call the value adapter during NamedContributorsMapAdapter construction
Update `NamedContributorsMapAdapter` so that the adapter function is
called only once per entry. Prior to this commit, the adapter was called
dynamically which made `CompositeHealthContributor` behave differently
from a regular `HealthContributor`.

See gh-31676
2 years ago
Andy Wilkinson 3a9525b5b7 Merge branch '2.6.x' into 2.7.x
Closes gh-31877
2 years ago
Andy Wilkinson 5243cb8369 Broaded dependency management for REST Assured
Closes gh-31864
2 years ago
Phillip Webb fd076ab9ef Merge branch '2.6.x' into 2.7.x
Closes gh-31875
2 years ago
Phillip Webb 923dd3504b Merge pull request #31870 from aoyvx
* pr/31870:
  Ensure PROTOCOL_HANDLER system property is reset

Closes gh-31870
2 years ago
aoyvx 8c93d2e8a7 Ensure PROTOCOL_HANDLER system property is reset
See gh-31870
2 years ago
Phillip Webb fcf12686b7 Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb 9329acdad8 Reduce size of 'repeated-open-array.txt' file
Attempt to fix CI memory issues.
2 years ago
Phillip Webb 96fa4cd63c Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb da91cde304 Protect against deeply nested JSON maps
See gh-31868
2 years ago
Phillip Webb 06805f06af Merge branch '2.6.x' into 2.7.x
Closes gh-31873
2 years ago
Phillip Webb 4132414206 Protect against deeply malformed JSON map keys
Fixes gh-31869
2 years ago
Phillip Webb 466724f77a Merge branch '2.6.x' into 2.7.x
Closes gh-31871
2 years ago
Phillip Webb 6966ebd2a3 Protect against deeply nested JSON lists
Update `BasicJsonParser` to protect against deeply nested JSON lists
in the same way as Jackson.

Fixes gh-31868
2 years ago
Phillip Webb a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2 years ago
Phillip Webb 24c4ba3b53 Merge pull request #31734 from marcwrobel
* pr/31734:
  Update copyright year for "Fix typos in code and documentation"
  Fix typos in code and documentation

Closes gh-31734
2 years ago
Phillip Webb f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2 years ago
Marc Wrobel dbfc6bded4 Fix typos in code and documentation
See gh-31734
2 years ago
Phillip Webb 3931e82841 Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb 4bcec6e0ee Polish 2 years ago
Phillip Webb 757a0c2664 Update copyright year of changed files 2 years ago
Andy Wilkinson ac3f552dde Merge branch '2.6.x' into 2.7.x
Closes gh-31846
2 years ago
Andy Wilkinson dd1d7a1c03 Merge pull request #31845 from dreis2211
* gh-31845:
  Polish

Closes gh-31845
2 years ago
dreis2211 de5834d203 Polish
See gh-31845
2 years ago
Andy Wilkinson 64dcfe520d Merge branch '2.6.x' into 2.7.x
Closes gh-31842
2 years ago
Andy Wilkinson a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files
Closes gh-31575
2 years ago
Andy Wilkinson 86db9091cf Merge branch '2.6.x' into 2.7.x 2 years ago
Spring Builds 0cf561a759 Next development version (v2.7.3-SNAPSHOT) 2 years ago
Spring Builds 75359a2bce Next development version (v2.6.11-SNAPSHOT) 2 years ago
Stephane Nicoll 16f63afd0b Merge branch '2.6.x' into 2.7.x 2 years ago
Stephane Nicoll c8e44372b2 Upgrade to Tomcat 9.0.65
Closes gh-31831
2 years ago
Stephane Nicoll aa93b2153a Upgrade to Embedded Mongo 3.4.7
Closes gh-31830
2 years ago
Stephane Nicoll 07f332ad96 Upgrade to Tomcat 9.0.65
Closes gh-31829
2 years ago
Scott Frederick 9da38c8d2d Merge branch '2.6.x' into 2.7.x
Closes gh-31826
2 years ago
Scott Frederick 4e0b3aad9f Clarify how docker image publishing registry is determined
Closes gh-31820
2 years ago
Scott Frederick f9cf31e59e Fix compile errors
See gh-28844
2 years ago
Scott Frederick 09c7ce6dab Merge branch '2.6.x' into 2.7.x
Closes gh-31824
2 years ago
Scott Frederick a7dfeae09c Merge branch 'gh-28844' into 2.6.x
Closes gh-31823
2 years ago
Scott Frederick 9b0cdac58a Simplify support for pushing images to unauthenticated registries
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.

Fixes gh-28844
2 years ago
Andy Wilkinson 2e98cafcca Merge branch '2.6.x' into 2.7.x
Closes gh-31818
2 years ago
Andy Wilkinson ab2b04fafd Find health contributors in ancestor contexts in non-reactive apps
Previously, health contributors in a non-reative app were found by
retrieving them from the application context rather than via
dependency injection. This results in only contributors from the
current context being found, with contributors in ancestor contexts
ignored.

This commit moves to injection of the contributors, aligning the
behaviour with that of a reactive application.

Closes gh-27308
2 years ago
Andy Wilkinson 13431745e0 Merge branch '2.6.x' into 2.7.x
Closes gh-31816
2 years ago
Andy Wilkinson 5afa04f3cd Remove redundant Checkstyle suppression
Closes gh-30131
2 years ago
Andy Wilkinson cd1ce50105 Merge branch '2.6.x' into 2.7.x
Closes gh-31814
2 years ago
Andy Wilkinson 182adeed35 Add modules to dependency management for Derby
Closes gh-31570
2 years ago
Brian Clozel 53b9ff5e89 Upgrade to Spring for GraphQL 1.0.1
Closes gh-31616
2 years ago
Brian Clozel 8cb2a0de94 Upgrade to GraphQL Java 18.2
Closes gh-31812
2 years ago