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
Stephane Nicoll
e18398236f
Upgrade to Maven Install Plugin 3.0.0
...
Closes gh-31833
2022-07-21 08:04:30 +02:00
Stephane Nicoll
a98c30866a
Upgrade to Maven Deploy Plugin 3.0.0
...
Closes gh-31832
2022-07-21 08:04:27 +02:00
Stephane Nicoll
aa93b2153a
Upgrade to Embedded Mongo 3.4.7
...
Closes gh-31830
2022-07-21 07:50:49 +02:00
Stephane Nicoll
939481b9d7
Upgrade to Spring Batch 5.0.0-M4
...
Closes gh-31623
2022-07-21 07:43:45 +02:00
Stephane Nicoll
dfda08fd0d
Upgrade to Spring Integration 6.0.0-M4
...
Closes gh-31624
2022-07-21 07:43:24 +02:00
Madhura Bhave
4057dd198b
Change preference of session store implementations
...
The order has been determined based on usage statistics.
Closes gh-27756
2022-07-20 15:36:52 -07:00
Scott Frederick
6f65777035
Merge branch '2.7.x'
...
Closes gh-31827
2022-07-20 17:31:37 -05: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
cf7a163c6d
Merge branch '2.7.x'
2022-07-20 16:07:32 -05:00
Scott Frederick
f9cf31e59e
Fix compile errors
...
See gh-28844
2022-07-20 16:07:19 -05:00
Scott Frederick
36d6106bb0
Merge branch '2.7.x'
...
Closes gh-31825
2022-07-20 15:11:30 -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
de672f4330
Merge branch '2.7.x'
...
Closes gh-31819
2022-07-20 21:02:06 +01:00