Commit Graph

2923 Commits

Author SHA1 Message Date
Phillip Webb
fcaac2b343 Merge branch '2.6.x' into 2.7.x
Closes gh-32777
2022-10-18 17:14:48 -07:00
Phillip Webb
2c7114fa17 Polish 'Use exclamation character for the document separator prefix'
See gh-32521
2022-10-18 17:08:21 -07:00
Guirong Hu
33e379c4a2 Use exclamation character for the document separator prefix
See gh-32521
2022-10-18 17:07:51 -07:00
Scott Frederick
6c1103cde0 Support PEM formatted elliptic-curve TLS keys
Apply the changes from e0c79ce598
to the `PrivateKeyParser` used for web server SSL configuration.

See gh-32646
2022-10-12 13:25:58 -05:00
Phillip Webb
0e98a577fe Merge branch '2.6.x' into 2.7.x 2022-09-30 21:18:09 -07:00
Phillip Webb
75f4d9e3fd Fix empty @DefaultValue annotation test failures on Java 17
See gh-32559
2022-09-30 21:16:48 -07:00
Phillip Webb
1eb0dd5e39 Merge branch '2.6.x' into 2.7.x
Closes gh-32563
2022-09-30 20:16:36 -07:00
Phillip Webb
efc431bdc4 Support empty @DefaultValue annotations on aggregates and optional
Update `ValueObjectBinder` to allow an empty `@DefaultValue` to be
used on map, collection, arrays and optional types.

Closes gh-32559
2022-09-30 18:21:54 -07:00
Andy Wilkinson
3ef633b096 Merge branch '2.6.x' into 2.7.x
Closes gh-32543
2022-09-29 11:39:42 +01:00
Andy Wilkinson
84a25c7dcf Configure Log4j2 classpath overrides consistently
Closes gh-32537
2022-09-29 11:25:21 +01:00
Stephane Nicoll
33680e5acc Merge branch '2.6.x' into 2.7.x
Closes gh-32509
2022-09-27 08:28:15 +02:00
Stephane Nicoll
0457536d72 Polish "Avoid using JUnit 4 assertions"
See gh-32504
2022-09-27 08:24:03 +02:00
dreis2211
cee353fba6 Avoid using JUnit 4 assertions
See gh-32504
2022-09-27 08:11:47 +02:00
Andy Wilkinson
52522b87f0 Merge branch '2.6.x' into 2.7.x
Closes gh-32393
2022-09-15 11:57:28 +01:00
Andy Wilkinson
77f428498f Compile against SnakeYAML 1.32 and test against older versions
Closes gh-32392
2022-09-15 11:55:44 +01:00
Stephane Nicoll
d4a88041dc Upgrade to R2DBC Bom Borca-SR2
Closes gh-32328
2022-09-14 11:01:19 +02:00
Andy Wilkinson
f17df7bf30 Merge branch '2.6.x' into 2.7.x
Closes gh-32284
2022-09-09 16:46:43 +01:00
Andy Wilkinson
23c2f73b3f Update tests to allow them to run on Java 19
Closes gh-32280
2022-09-09 16:46:14 +01:00
Phillip Webb
e88a682220 Merge branch '2.6.x' into 2.7.x 2022-09-08 19:37:52 -07:00
Phillip Webb
85697ac482 Update copyright year of changed files 2022-09-08 19:36:59 -07:00
Andy Wilkinson
020e6dd3f1 Merge branch '2.6.x' into 2.7.x
Closes gh-32260
2022-09-08 15:28:08 +01:00
Andy Wilkinson
280ce6390a Add NINETEEN to JavaVersion enum
Closes gh-32226
2022-09-08 15:25:34 +01:00
Stephane Nicoll
9ef067d589 Merge branch '2.6.x' into 2.7.x
Closes gh-32244
2022-09-07 08:45:19 +02:00
valentine-dev
89e19ddab9 Support lower-case input in PeriodStyle
See gh-32235
2022-09-07 08:40:16 +02:00
Andy Wilkinson
2003cfdd43 Merge branch '2.6.x' into 2.7.x
Closes gh-32231
2022-09-05 15:42:28 +01:00
Andy Wilkinson
bc23e70024 Polish "Support lower-case input in DurationStyle"
See gh-32223
2022-09-05 14:53:50 +01:00
valentine-dev
c579c9378b Support lower-case input in DurationStyle
See gh-32223
2022-09-05 14:53:29 +01:00
Brian Clozel
cca5ee8a89 Merge branch '2.6.x' into 2.7.x
Closes gh-32229
2022-09-05 14:24:06 +02:00
Brian Clozel
724f9ebf71 Support SnakeYaml 1.31
This commit keeps the managed dependency for SnakeYaml at 1.29 but
enables forward compatibility for SnakeYaml 1.31.

Closes gh-32228
2022-09-05 14:22:24 +02:00
Phillip Webb
9e1a69efc9 Merge branch '2.6.x' into 2.7.x
Closes gh-32031
2022-08-09 10:23:25 +01:00
Phillip Webb
2f85ea3a30 Protect against deeply nested maps
Update BasicJsonParser to fix the deeply nested map protection logic.

Fixes gh-32029
2022-08-09 10:21:13 +01:00
Andy Wilkinson
700460c322 Merge branch '2.6.x' into 2.7.x
Closes gh-31971
2022-08-03 14:58:07 +01:00
Andy Wilkinson
fa73b73898 Fail build on missing configuration property descriptions
Closes gh-31916
2022-08-03 14:45:42 +01:00
Phillip Webb
cfde1878dd Merge branch '2.6.x' into 2.7.x
Closes gh-31967
2022-08-03 12:34:52 +01:00
Phillip Webb
d540eefce0 Set running to false when stop method is called
Update `WebServerStartStopLifecycle` to change the `running` state when
the `stop()` method is called.

Fixes gh-31966
2022-08-03 12:34:37 +01:00
Phillip Webb
c652d3d95b Merge branch '2.6.x' into 2.7.x
Closes gh-31963
2022-08-03 11:34:24 +01:00
Phillip Webb
45ad1557c3 Perform LoggingSystem cleanup after web server shutdown
Update `LoggingApplicationListener` so that logging system cleanup is
performed by a `SmartLifecycle` phased after web server shutdown.

Prior to this commit, cleanup occurred on the `ContextClosedEvent` which
was published before Lifecycle beans were stopped. This meant that any
exceptions output during web server shutdown were not logged.

Fixes gh-9457
2022-08-03 11:34:05 +01:00
Andy Wilkinson
0dde4278db Merge branch '2.6.x' into 2.7.x
Closes gh-31951
2022-08-01 21:09:37 +01:00
Marc Wrobel
3e0665e791 Fix links in documentations
- Fix broken links
- Use HTTPS where possible,
- Remove spring-security-oauth2-docs as it is no longer used
- Remove https://github.com/ThierrySquirrel/rocketmq-spring-boot-starter.
  This starter is 404 and https://github.com/rocketmq/rocketmq-spring-boot-starter
  hasn't been updated for 4 years.
- Clean up nohttp allowlist.lines.

See gh-31887
2022-08-01 21:07:36 +01:00
Stephane Nicoll
4806881716 Merge branch '2.6.x' into 2.7.x
Closes gh-31921
2022-07-29 14:35:15 +02:00
Stephane Nicoll
3a5b40645a Restore support for C3P0
Closes gh-31920
2022-07-29 14:07:59 +02:00
Phillip Webb
5c52882f76 Merge branch '2.6.x' into 2.7.x
Closes gh-31901
2022-07-28 10:44:42 +01:00
Phillip Webb
9a2ad6d42d Remove references to ConfigFileApplicationListener
Update documentation and meta-data to remove referenced to the now
deprecated `ConfigFileApplicationListener` class.

Closes gh-31895
2022-07-28 10:43:48 +01:00
Phillip Webb
220c588996 Merge branch '2.6.x' into 2.7.x
Closes gh-31899
2022-07-28 10:37:00 +01:00
Phillip Webb
98627e3d71 Fix spring.beaninfo.ignore SourceType
Fixes gh-31898
2022-07-28 10:36:19 +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