Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,535 Commits 23 Branches 0 Tags
bfc703a40d3cd5054b60f4faa80b58e3bfddee1f
Commit Graph

17096 Commits

Author SHA1 Message Date
Phillip Webb
bfc703a40d Merge branch '2.6.x' into 2.7.x 
Closes gh-31879
 2022-07-26 18:16:13 +01:00
Phillip Webb
59c9a9cd8a Polish "Call the value adapter during NamedContributorsMapAdapter construction" 
See gh-31676
 2022-07-26 18:15:32 +01:00
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
 2022-07-26 18:15:32 +01:00
Andy Wilkinson
3a9525b5b7 Merge branch '2.6.x' into 2.7.x 
Closes gh-31877
 2022-07-26 17:58:12 +01:00
Andy Wilkinson
5243cb8369 Broaded dependency management for REST Assured 
Closes gh-31864
 2022-07-26 17:54:47 +01:00
Phillip Webb
fd076ab9ef Merge branch '2.6.x' into 2.7.x 
Closes gh-31875
 2022-07-26 17:46:20 +01:00
aoyvx
8c93d2e8a7 Ensure PROTOCOL_HANDLER system property is reset 
See gh-31870
 2022-07-26 17:20:55 +01:00
Phillip Webb
fcf12686b7 Merge branch '2.6.x' into 2.7.x 2022-07-26 16:14:18 +01:00
Phillip Webb
9329acdad8 Reduce size of 'repeated-open-array.txt' file 
Attempt to fix CI memory issues.
 2022-07-26 16:13:44 +01:00
Phillip Webb
96fa4cd63c Merge branch '2.6.x' into 2.7.x 2022-07-26 15:53:17 +01:00
Phillip Webb
da91cde304 Protect against deeply nested JSON maps 
See gh-31868
 2022-07-26 15:52:57 +01:00
Phillip Webb
06805f06af Merge branch '2.6.x' into 2.7.x 
Closes gh-31873
 2022-07-26 15:52:12 +01:00
Phillip Webb
4132414206 Protect against deeply malformed JSON map keys 
Fixes gh-31869
 2022-07-26 15:47:50 +01:00
Phillip Webb
466724f77a Merge branch '2.6.x' into 2.7.x 
Closes gh-31871
 2022-07-26 15:37:41 +01:00
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
 2022-07-26 15:25:38 +01:00
Phillip Webb
a4ef6a7c5c Merge branch '2.6.x' into 2.7.x 
Closes gh-31865
 2022-07-26 12:13:16 +01:00
Phillip Webb
f8412847dc Update copyright year for "Fix typos in code and documentation" 
See gh-31734
 2022-07-26 12:08:30 +01:00
Marc Wrobel
dbfc6bded4 Fix typos in code and documentation 
See gh-31734
 2022-07-26 12:08:07 +01:00
Phillip Webb
3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb
4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Andy Wilkinson
ac3f552dde Merge branch '2.6.x' into 2.7.x 
Closes gh-31846
 2022-07-22 14:47:45 +01:00
dreis2211
de5834d203 Polish 
See gh-31845
 2022-07-22 14:46:01 +01:00
Andy Wilkinson
64dcfe520d Merge branch '2.6.x' into 2.7.x 
Closes gh-31842
 2022-07-22 12:15:39 +01:00
Andy Wilkinson
a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files 
Closes gh-31575
 2022-07-22 12:09:58 +01:00
Stephane Nicoll
aa93b2153a Upgrade to Embedded Mongo 3.4.7 
Closes gh-31830
 2022-07-21 07:50:49 +02:00
Scott Frederick
9da38c8d2d Merge branch '2.6.x' into 2.7.x 
Closes gh-31826
 2022-07-20 17:29:58 -05:00
Scott Frederick
4e0b3aad9f Clarify how docker image publishing registry is determined 
Closes gh-31820
 2022-07-20 17:29:40 -05:00
Scott Frederick
f9cf31e59e Fix compile errors 
See gh-28844
 2022-07-20 16:07:19 -05:00
Scott Frederick
09c7ce6dab Merge branch '2.6.x' into 2.7.x 
Closes gh-31824
 2022-07-20 15:10:43 -05:00
Scott Frederick
a7dfeae09c Merge branch 'gh-28844' into 2.6.x 
Closes gh-31823
 2022-07-20 15:10:27 -05:00
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
 2022-07-20 15:06:05 -05:00
Andy Wilkinson
2e98cafcca Merge branch '2.6.x' into 2.7.x 
Closes gh-31818
 2022-07-20 21:01:47 +01:00
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
 2022-07-20 20:52:02 +01:00
Andy Wilkinson
cd1ce50105 Merge branch '2.6.x' into 2.7.x 
Closes gh-31814
 2022-07-20 19:24:38 +01:00
Andy Wilkinson
182adeed35 Add modules to dependency management for Derby 
Closes gh-31570
 2022-07-20 19:23:50 +01:00
Brian Clozel
53b9ff5e89 Upgrade to Spring for GraphQL 1.0.1 
Closes gh-31616
 2022-07-20 17:37:41 +02:00
Brian Clozel
8cb2a0de94 Upgrade to GraphQL Java 18.2 
Closes gh-31812
 2022-07-20 17:36:45 +02:00
Andy Wilkinson
c3f3a2a707 Merge branch '2.6.x' into 2.7.x 
Closes gh-31810
 2022-07-20 11:54:01 +01:00
Andy Wilkinson
efdd844c7a Log a warning if determining the app's PID takes too long 
Closes gh-31572
 2022-07-20 11:53:12 +01:00
Andy Wilkinson
84efc89d76 Merge branch '2.6.x' into 2.7.x 
Closes gh-31806
 2022-07-20 10:52:00 +01:00
Andy Wilkinson
bcbe072d96 Fix 500 from mappings endpoint with attributed WebFlux router function 
Closes gh-31784
 2022-07-20 10:42:56 +01:00
Andy Wilkinson
10e19d504a Merge branch '2.6.x' into 2.7.x 
Closes gh-31804
 2022-07-20 10:17:39 +01:00
Andy Wilkinson
628c2cd0b1 Ensure JMX endpoints are uniquely named in a context hierarchy 
Closes gh-31718
 2022-07-20 10:15:52 +01:00
Stephane Nicoll
6469a02c35 Merge branch '2.6.x' into 2.7.x 
Closes gh-31801
 2022-07-20 09:52:41 +02:00
Stephane Nicoll
585a57be76 Update copyright year of changed file 
See gh-31798
 2022-07-20 09:45:57 +02:00
aoyvx
abe938eb2c Use Bean ClassLoader consistently to resolve class names 
See gh-31798
 2022-07-20 09:45:33 +02:00
Stephane Nicoll
b9cf951423 Upgrade to Spring Integration 5.5.14 
Closes gh-31800
 2022-07-20 09:16:59 +02:00
Stephane Nicoll
ac65835103 Upgrade to Spring Integration 5.5.14 
Closes gh-31799
 2022-07-20 09:16:17 +02:00
Brian Clozel
7c7a32a568 Auto-configure GraphQL subscription exception handling 
Closes gh-31794
 2022-07-19 16:53:11 +02:00
Stephane Nicoll
a62ea1e3b8 Upgrade to AppEngine SDK 1.9.98 
Closes gh-31790
 2022-07-19 14:14:05 +02:00