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

2876 Commits

Author SHA1 Message Date
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
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
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
Stephane Nicoll
52d4dd9347 Merge branch '2.6.x' into 2.7.x 
Closes gh-31780
 2022-07-18 11:49:22 +02:00
Stephane Nicoll
4eb5037828 Update copyright year of changed files 
See gh-31571
 2022-07-18 11:48:35 +02:00
TheoCaldas
869ed4f71a Delimit output value in failure analysis 
See gh-31571
 2022-07-18 11:36:39 +02:00
Stephane Nicoll
92a7af4038 Merge branch '2.6.x' into 2.7.x 
Closes gh-31777
 2022-07-18 11:30:36 +02:00
Johnny Lim
f591c75ad7 Disable incompatible tests on macOS AArch64 
This commit also updates related test support classes.

See gh-31539
 2022-07-18 11:25:52 +02:00
Andy Wilkinson
b6b4b3b5b6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31732
 2022-07-14 15:39:15 +01:00
Andy Wilkinson
9443713c53 Disable Log4j2's shutdown hook with 2.18 and later 
Closes gh-31719
 2022-07-14 15:38:19 +01:00
Moritz Halbritter
d4b1c219ab Move test imports from main to test resources 
They shouldn't have been in main resources in the first place, this was
an accident.
 2022-07-07 15:15:34 +02:00
Andy Wilkinson
2f01739e0d Polish since date on new SslStoreProvider API 
See gh-31253
 2022-06-26 08:18:21 +01:00
Andy Wilkinson
71526bf44f Polish 
See gh-31253
 2022-06-25 13:47:25 +01:00
Andy Wilkinson
7abc7df7b8 Allow PEM certificates to be used without a key store password 
Closes gh-31253
 2022-06-24 18:01:20 +01:00
Andy Wilkinson
1e08f545d0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31525
 2022-06-24 13:05:06 +01:00
Andy Wilkinson
f49b16c645 Upgrade to Spring Java Format 0.0.34 
Closes gh-31524
 2022-06-24 12:57:52 +01:00
Andy Wilkinson
268f13dbd7 Merge branch '2.6.x' into 2.7.x 
Closes gh-31499
 2022-06-22 19:49:38 +01:00
Andy Wilkinson
522ea0a90e Handle malformed JSON more consistently 
Closes gh-31301
 2022-06-22 18:31:16 +01:00
Phillip Webb
7c91ebb1b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31408
 2022-06-16 15:36:00 -07:00
Phillip Webb
ae6311ddda Prevent Logback from accidentally being used in Log4J2LoggingSystemTests 
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.

Fixes gh-19365
 2022-06-16 15:35:32 -07:00
Andy Wilkinson
6de4ade0cf Merge branch '2.6.x' into 2.7.x 
Closes gh-31379
 2022-06-14 11:16:57 +01:00
Andy Wilkinson
5d7cab09b8 Revert BindConverter changes that are now handled by Framework 
See gh-28592 and spring-projects/spring-framework#28609

Closes gh-31343
 2022-06-14 10:37:35 +01:00
Phillip Webb
7bf82b5349 Merge branch '2.6.x' into 2.7.x 2022-06-10 16:13:35 -07:00
Phillip Webb
63fdd729f5 Refine conversion service type check 
Update fix to account for primitive types.

See gh-28592
 2022-06-10 16:12:38 -07:00
Phillip Webb
beb1c15219 Merge branch '2.6.x' into 2.7.x 
Closes gh-31341
 2022-06-10 14:30:02 -07:00
Phillip Webb
31b0264d94 Ensure conversion service actually converts to the correct type 
Update `BindConverter` with a guard to ensure that the resulting object
is the correct type.

Fixes gh-28592
 2022-06-10 14:29:25 -07:00
Anthony Vanelverdinghe
ed1e7382ab Fix typo in ImportCandidates javadoc 
See gh-31277
 2022-06-10 12:42:43 -07:00
Andy Wilkinson
7f291f8da0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31220
 2022-05-31 11:14:08 +01:00
Andy Wilkinson
348662b15e Remove unused deduceFromApplicationContext and supporting code 
Closes gh-31218
 2022-05-31 10:57:22 +01:00
Andy Wilkinson
d2397bd34e Merge branch '2.6.x' into 2.7.x 
Closes gh-31188
 2022-05-27 11:14:29 +01:00
Andy Wilkinson
83e8c039b3 Add application/wasm to MIME mappings 
Closes gh-30885
 2022-05-27 11:14:04 +01:00
Andy Wilkinson
194e9f0f79 Merge branch '2.6.x' into 2.7.x 
Closes gh-31183
 2022-05-27 10:02:08 +01:00
Andy Wilkinson
56c3a5f0ab Polish "Assert that sources does not contain null elements" 
See gh-30878
 2022-05-27 10:01:06 +01:00
Guirong Hu
ebf276c005 Assert that sources does not contain null elements 
See gh-30878
 2022-05-27 10:00:32 +01:00
Andy Wilkinson
935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson
455ee0ce22 Merge branch '2.6.x' into 2.7.x 
Closes gh-31177
 2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8 Remove redundant throws declarations from internal APIs 
Closes gh-31176
 2022-05-26 15:47:35 +01:00
Andy Wilkinson
b3a4982f31 Merge branch '2.6.x' into 2.7.x 
Closes gh-31174
 2022-05-26 14:01:23 +01:00
Andy Wilkinson
cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0 
Closes gh-30903
 2022-05-26 13:59:03 +01:00