Commit Graph

39180 Commits (e6977777ccfdf12368bad55978a3fab287544a22)
 

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 17aa5d2d23 Merge branch '2.7.x'
Closes gh-31878
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 35a65cf82e Merge branch '2.7.x'
Closes gh-31876
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
Stephane Nicoll 193c1d7acf Adapt to changes in DefaultGenerationContext
See https://github.com/spring-projects/spring-framework/issues/28877
2 years ago
Phillip Webb d6cce1f441 Merge branch '2.7.x' 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 e08aa84892 Merge branch '2.7.x' 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 a7ea5dfeda Merge branch '2.7.x'
Closes gh-31874
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 0b1441f119 Merge branch '2.7.x'
Closes gh-31872
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 7377d85096 Merge branch '2.7.x'
Closes gh-31866
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 b93dbd56e8 Merge branch '2.7.x' 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
Stephane Nicoll a0dd6ef3b1 Revert "Merge pull request #31828 from quaff"
This reverts commit 68fc87bc7f.

See gh-31828
2 years ago
Moritz Halbritter 24cf5fff84 Start building against Spring HATEOAS 2.0.0-SNAPSHOT
See gh-31855
2 years ago
Andy Wilkinson 68fc87bc7f Merge pull request #31828 from quaff
* gh-31828:
  Polish "Take MethodType into account to deduce main application class"
  Take MethodType into account to deduce main application class

Closes gh-31828
2 years ago
Andy Wilkinson b9b25644af Polish "Take MethodType into account to deduce main application class"
See gh-31828
2 years ago
Yanming Zhou 10a2471979 Take MethodType into account to deduce main application class
See gh-31828
2 years ago
Andy Wilkinson add720594e Merge pull request #31849 from dreis2211
* gh-31849:
  Align Kotlin API and language versions

Closes gh-31849
2 years ago
dreis2211 75f375c68e Align Kotlin API and language versions
See gh-31849
2 years ago
Stephane Nicoll f962f2a430 Configure NBT so that it works consistently
This commit configures the Native Build Tools plugin to use Maven's
`target/classes` rather than the default generated JAR of the project.
Previously, this would fail with the default repackage option as the
default JAR is the repackaged archive and it has a specific format that
NBT can't understand.

Closes gh-31848
2 years ago
Andy Wilkinson 85c41d6698 Merge branch '2.7.x'
Closes gh-31847
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 6c28156b29 Avoid config-time creation of AOT source set's tasks
Closes gh-31844
2 years ago
Andy Wilkinson 0980362a88 Merge branch '2.7.x'
Closes gh-31843
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
Moritz Halbritter 35c49afd97 Generate hints for nested generics in configuration properties
See gh-31708
2 years ago