Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,613 Commits 23 Branches 0 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph

26227 Commits

Author SHA1 Message Date
Stephane Nicoll
59139e632b Polish "Disable auto-detection in tests that start Hazelcast" 
See gh-31863
 2022-07-27 08:30:17 +02:00
Adrian Bob
aad9c8906a Disable auto-detection in tests that start Hazelcast 
This commit updates test configurations to disable auto-detection of
Hazelcast instances.

See gh-31863
 2022-07-27 08:16:48 +02:00
Stephane Nicoll
782e3f75b6 Polish Hazelcast configuration 
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.

See gh-31863
 2022-07-27 08:15:53 +02:00
Madhura Bhave
aac1829106 Make Batch auto-configuration back-off is spring-jdbc isn't present 
See gh-29487
 2022-07-26 15:11:00 -07:00
Madhura Bhave
2804c84648 Adapt to spring-jdbc being required by Spring Batch 
Closes gh-29487
 2022-07-26 14:03:22 -07:00
Phillip Webb
94ca5b5b53 Merge branch '2.7.x' 
Closes gh-31880
 2022-07-26 18:16:44 +01:00
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
17aa5d2d23 Merge branch '2.7.x' 
Closes gh-31878
 2022-07-26 17:58:40 +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
35a65cf82e Merge branch '2.7.x' 
Closes gh-31876
 2022-07-26 17:48:00 +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
Stephane Nicoll
193c1d7acf Adapt to changes in DefaultGenerationContext 
See https://github.com/spring-projects/spring-framework/issues/28877
 2022-07-26 18:06:46 +02:00
Phillip Webb
d6cce1f441 Merge branch '2.7.x' 2022-07-26 16:14:34 +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
e08aa84892 Merge branch '2.7.x' 2022-07-26 15:53:33 +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
a7ea5dfeda Merge branch '2.7.x' 
Closes gh-31874
 2022-07-26 15:52:33 +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
0b1441f119 Merge branch '2.7.x' 
Closes gh-31872
 2022-07-26 15:38:25 +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
7377d85096 Merge branch '2.7.x' 
Closes gh-31866
 2022-07-26 12:18:14 +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
b93dbd56e8 Merge branch '2.7.x' 2022-07-26 10:51:17 +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
Stephane Nicoll
a0dd6ef3b1 Revert "Merge pull request #31828 from quaff" 
This reverts commit 68fc87bc7f.

See gh-31828
 2022-07-25 16:16:51 +02:00
Moritz Halbritter
24cf5fff84 Start building against Spring HATEOAS 2.0.0-SNAPSHOT 
See gh-31855
 2022-07-25 09:34:33 +02:00
Andy Wilkinson
b9b25644af Polish "Take MethodType into account to deduce main application class" 
See gh-31828
 2022-07-22 19:39:14 +01:00
Yanming Zhou
10a2471979 Take MethodType into account to deduce main application class 
See gh-31828
 2022-07-22 19:36:30 +01:00
dreis2211
75f375c68e Align Kotlin API and language versions 
See gh-31849
 2022-07-22 19:34:41 +01:00
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
 2022-07-22 17:36:25 +02:00
Andy Wilkinson
85c41d6698 Merge branch '2.7.x' 
Closes gh-31847
 2022-07-22 14:48:29 +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
6c28156b29 Avoid config-time creation of AOT source set's tasks 
Closes gh-31844
 2022-07-22 14:14:03 +01:00
Andy Wilkinson
0980362a88 Merge branch '2.7.x' 
Closes gh-31843
 2022-07-22 12:20:17 +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
Moritz Halbritter
35c49afd97 Generate hints for nested generics in configuration properties 
See gh-31708
 2022-07-21 16:32:40 +02:00
Olga Maciaszek-Sharma
57dc274284 Switch to Spring Framework SNAPSHOTs 
Switch to Spring Framework SNAPSHOTs and adapt to updated APIs.

See gh-31834
 2022-07-21 13:42:48 +01:00