Commit Graph

3515 Commits

Author SHA1 Message Date
Andy Wilkinson
e314e11985 Fix AOT processing of @MultipartConfig annotated @WebServlet
Closes gh-37637
2023-10-13 16:22:38 +01:00
Andy Wilkinson
931584f8af Merge branch '2.7.x' into 3.0.x
Closes gh-37659
2023-10-03 10:28:51 +01:00
Johnny Lim
c9932bb73a Use AssertJ's fail, not JUnit's
This commit also updates Checkstyle to prevent use of JUnit's
assertions from being reintroduced.

See gh-37655
2023-10-03 10:11:12 +01:00
Andy Wilkinson
458418be29 Automatically register reflection hints for scanned WebListeners
Closes gh-36008
2023-09-29 18:09:36 +01:00
Andy Wilkinson
688a69b9b1 Prevent status messages from logging when Logback is being configured
There's a window where the deny-all turbo filter has been removed but
Logback has not yet been configured. If any logging that would have
reached an appender is performed in this window, unwanted status
messages will be logged. This window can be closed by ensuring that
the turbo filter is in place while Logback is being configured.

Closes gh-34505
2023-09-27 12:28:23 +01:00
Moritz Halbritter
b93ce92022 Merge branch '2.7.x' into 3.0.x
Closes gh-37569
2023-09-25 11:39:18 +02:00
Moritz Halbritter
b266ade00c Prevent exception when loading optional config data locations
Closes gh-35683
2023-09-25 11:39:04 +02:00
Moritz Halbritter
dc8e69cc8d Merge branch '2.7.x' into 3.0.x
Closes gh-37512
2023-09-21 16:44:05 +02:00
Johnny Lim
b95092c621 Fix wrong mocking
See gh-37492
2023-09-21 16:42:43 +02:00
Andy Wilkinson
2a3d5c4e0e Tolerate parallel init of SLF4J
Closes gh-37477
2023-09-20 10:49:01 +01:00
Moritz Halbritter
9a1e146c86 Polish PrivateKeyParserTests 2023-09-18 09:51:39 +02:00
Moritz Halbritter
1b098951aa Merge branch '2.7.x' into 3.0.x 2023-09-15 15:39:28 +02:00
Moritz Halbritter
36629df416 Remove useless file 2023-09-15 15:39:18 +02:00
Moritz Halbritter
5be826dd4a Merge branch '2.7.x' into 3.0.x
Closes gh-37413
2023-09-15 14:47:57 +02:00
Moritz Halbritter
408fb8ae9d Add support for EdDSA, XDH and RSA-PSS key parsing
This works with Java 17 and up. Also refactor the test for more
structure.

Closes gh-37237
2023-09-15 14:15:02 +02:00
Andy Wilkinson
eba2f718a7 Merge branch '2.7.x' into 3.0.x
Closes gh-37363
2023-09-13 11:15:16 +01:00
Moritz Halbritter
13a3e3bdf0 Add TWENTY_ONE to JavaVersion
Closes gh-37362
2023-09-13 11:04:22 +01:00
Stephane Nicoll
112e85507c Support AOT processing of Value Object with several constructors
Previously, AOT processing failed on processing an immutable
configuration properties that declare several constructors as the core
framework infrastructure tries to resolve the "autowired" constructor
to use, even if the custom code fragments are never going to use it.

This commit workarounds the problem in maintenance releases until a
proper fix is provided in the core framework. When AOT runs, a
SmartInstantiationAwareBeanPostProcessor is added to the bean factory
to provide the constructor to use. This implementation relies on the
same algorithm that the binder uses at runtime.

Closes gh-37283
2023-09-11 15:27:02 +02:00
Andy Wilkinson
ca254e51f6 Start building against Spring Framework 6.0.12 snapshots
See gh-37258
2023-09-08 12:07:43 +01:00
Phillip Webb
71ed31343c Merge branch '2.7.x' into 3.0.x
Closes gh-37168
2023-08-31 22:01:06 -07:00
Phillip Webb
fd8cb74b46 Load algorithm parameters from PEM encoded 'EC PRIVATE KEY' files
Update `PrivateKeyParser` implementations so that algorithm parameters
for PEM encoded 'EC PRIVATE KEY' files are loaded from the incoming
data.

Prior to this commit, the algorithm parameter was hard-coded to
'secp384r1' which could result in a mismatch to the actual file
content.

Fixes gh-34232
2023-08-31 21:40:11 -07:00
Andy Wilkinson
a8e37b5cc5 Merge branch '2.7.x' into 3.0.x
Closes gh-37142
2023-08-30 13:34:12 +01:00
Andy Wilkinson
2de98a84bc Polish "Polish code and javadoc"
See gh-37112
2023-08-30 13:31:58 +01:00
hakan-krgn
6d9ce8a3b5 Polish code and javadoc
See gh-37112
2023-08-30 13:31:58 +01:00
Stephane Nicoll
eed6e199fc Polish "Detect logback config location as xml if path ends with .xml"
See gh-37039
2023-08-22 10:33:03 +02:00
Yanming Zhou
c9cc1da48e Detect logback config location as xml if path ends with .xml
See gh-37039
2023-08-22 10:06:29 +02:00
Stephane Nicoll
f3450fde7d Detect nested types that are not directly nested to the current type
This commit makes sure that sub-namespace that are defined in a flat
manner in a configuration properties are considered for runtime hints

Closes gh-36909
2023-08-17 17:07:27 +02:00
Stephane Nicoll
fe12e75955 Merge branch '2.7.x' into 3.0.x
Closes gh-36968
2023-08-14 15:20:40 +02:00
Stephane Nicoll
e043fe434a Update copyright year of changed file
See gh-36965
2023-08-14 15:13:32 +02:00
abaudat
3ad0e77db8 Align javadoc of AbstractFilterRegistrationBean#setDispatcherTypes
See gh-36965
2023-08-14 15:13:04 +02:00
Phillip Webb
a0089c5c76 Merge branch '2.7.x' into 3.0.x 2023-08-13 18:44:36 -07:00
Phillip Webb
46773dd5df Update copyright year of changed files 2023-08-13 18:19:05 -07:00
Phillip Webb
527b2f2cac Polish 2023-08-13 18:18:48 -07:00
Andy Wilkinson
f82f4d6b56 Merge branch '2.7.x' into 3.0.x
Closes gh-36855
2023-08-09 12:00:45 +01:00
Andy Wilkinson
694ff4f875 Include throwables from Logback errors when reporting invalid config
Closes gh-32562
2023-08-09 11:43:58 +01:00
Andy Wilkinson
34b2de3095 Merge branch '2.7.x' into 3.0.x
Closes gh-36785
2023-08-08 11:28:59 +01:00
Andy Wilkinson
35d3cdbe74 Fail more helpfully when schema or data location is a directory
Previously a schema or data locatio that was a directory would
result in an attempt being made to apply the directory listing as
SQL scripts. This would typically result in a hard to diagnose
failure due to the directory listing not being valid SQL.

This commit updates the initializer to ignore locations for
which the Resources is not readable. This works as Framework's
Resource abstraction does not consider directory resources to be
readable.

Closes gh-36386
2023-08-08 11:20:07 +01:00
Stephane Nicoll
f8a5aff160 Merge branch '2.7.x' into 3.0.x
Closes gh-36758
2023-08-04 16:07:04 +02:00
Stephane Nicoll
1e5a72f1f8 Provide nested cause if datasource fails to provide DatabaseDriver
Closes gh-34728
2023-08-04 16:01:14 +02:00
Stephane Nicoll
05df721d51 Merge branch '2.7.x' into 3.0.x 2023-08-04 16:00:02 +02:00
Stephane Nicoll
97ce95c417 Polish "Upgrade to MariaDB 3.1.4"
See gh-36394
2023-08-04 15:58:32 +02:00
Stephane Nicoll
de632dd77b Merge branch '2.7.x' into 3.0.x
Closes gh-36734
2023-08-04 14:11:51 +02:00
Stephane Nicoll
fd88024402 Add @since for JavaVersion values
Closes gh-36608
2023-08-04 14:09:12 +02:00
Andy Wilkinson
3e99118a48 Merge branch '2.7.x' into 3.0.x
Closes gh-36633
2023-07-28 12:22:21 +01:00
Johnny Lim
5a205dbfd1 Polish
See gh-36620
2023-07-28 11:35:33 +01:00
Andy Wilkinson
81844c04c4 Merge branch '2.7.x' into 3.0.x
Closes gh-36629
2023-07-28 11:31:49 +01:00
rob-valor
4bbfc5e630 Correct RestTemplateBuilder#defaultHeader javadoc
Replace reactor.netty.http.client.HttpClientRequest with
org.springframework.http.client.ClientHttpRequest

See gh-36614
2023-07-28 11:30:46 +01:00
Moritz Halbritter
c187d96367 Merge branch '2.7.x' into 3.0.x
Closes gh-36583
2023-07-26 10:23:08 +02:00
Francisco Bento
307d6c0a97 Fix Tomcat SSL protocol warn message
See gh-36572
2023-07-26 10:21:43 +02:00
Stephane Nicoll
3aeb853c63 Merge branch '2.7.x' into 3.0.x
Closes gh-36519
2023-07-24 13:24:40 +02:00