Commit Graph

3761 Commits

Author SHA1 Message Date
Phillip Webb
b3ddec7793 Refactor Jetty SameSiteSupplier cookie support to use a Handler
Update `JettyServletWebServerFactory` so that the `SimeSiteSupplier`
support is handled using a `Handler` rather than a `HttpStream.Wrapper`.

Closes gh-37809
2023-10-10 15:57:32 -07:00
Andy Wilkinson
1d410dccea Adapt to breaking API change in Framework
See gh-37710
2023-10-10 17:21:33 +01:00
Andy Wilkinson
15ee305ef3 Upgrade to Jetty 12.0.2
Closes gh-37803
2023-10-10 16:42:35 +01:00
Moritz Halbritter
0a16ec17e9 Add property to enable key verification on PEM SSL bundles
Closes gh-37727
2023-10-05 09:49:49 +02:00
Phillip Webb
fd9b2b114e Improve Tomcat performance when using nested jars
Add `NestedJarResourceSet` which can be used for nested jar URLs
and unlike the standard Tomcat implementation does not assume that
the JAR is backed by a single file.

Closes gh-37452
2023-10-03 17:27:57 -07:00
Andy Wilkinson
7d40a45b50 Merge branch '3.1.x'
Closes gh-37662
2023-10-03 11:21:29 +01:00
Andy Wilkinson
a4100e12ff Merge branch '3.0.x' into 3.1.x
Closes gh-37661
2023-10-03 11:05:51 +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
d725914cd5 Merge branch '3.1.x'
Closes gh-37636
2023-09-29 18:36:25 +01:00
Andy Wilkinson
1e4deed8ce Merge branch '3.0.x' into 3.1.x
Closes gh-37635
2023-09-29 18:36:09 +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
145fb161a1 Merge branch '3.1.x'
Closes gh-37601
2023-09-27 12:50:58 +01:00
Andy Wilkinson
0368fc5678 Merge branch '3.0.x' into 3.1.x
Closes gh-37600
2023-09-27 12:38:21 +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
Andy Wilkinson
ab06d10d64 Fix checkpoint-restore with replaced or wrapped HikariDataSource
Closes gh-37580
2023-09-26 12:31:12 +01:00
Moritz Halbritter
11ec9f95f6 Merge branch '3.1.x'
Closes gh-37571
2023-09-25 11:40:16 +02:00
Moritz Halbritter
02f71d8e95 Merge branch '3.0.x' into 3.1.x
Closes gh-37570
2023-09-25 11:39:29 +02: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
279f1e2d0f Merge branch '3.1.x'
Closes gh-37514
2023-09-21 16:44:22 +02:00
Moritz Halbritter
ddd666497d Merge branch '3.0.x' into 3.1.x
Closes gh-37513
2023-09-21 16:44:14 +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
Phillip Webb
f55184a998 Update copyright year of changed files 2023-09-20 17:16:31 -07:00
Andy Wilkinson
b87e47e90c Merge branch '3.1.x'
Closes gh-37485
2023-09-20 10:56:35 +01:00
Andy Wilkinson
e10ca23b41 Merge branch '3.0.x' into 3.1.x
Closes gh-37484
2023-09-20 10:56:20 +01:00
Andy Wilkinson
2a3d5c4e0e Tolerate parallel init of SLF4J
Closes gh-37477
2023-09-20 10:49:01 +01:00
Moritz Halbritter
d4fe3bfea7 Merge branch '3.1.x'
Closes gh-37446
2023-09-18 14:24:54 +02:00
Moritz Halbritter
af244e1550 Start Threshold filters in DefaultLogbackConfiguration
Closes gh-36741
2023-09-18 14:11:09 +02:00
Moritz Halbritter
4c4fdb35e9 Merge branch '3.1.x' 2023-09-18 09:53:17 +02:00
Moritz Halbritter
3900c0ad58 Merge branch '3.0.x' into 3.1.x 2023-09-18 09:53:07 +02:00
Moritz Halbritter
9a1e146c86 Polish PrivateKeyParserTests 2023-09-18 09:51:39 +02:00
Moritz Halbritter
2367990150 Merge branch '3.1.x' 2023-09-18 09:49:52 +02:00
Moritz Halbritter
0ba928bf2d Polish PemPrivateKeyParserTests
Add tests for:
  - aes128 and aes256 encrypted keys
  - scrypt encrypted keys
  - des3 encrypted keys
  - encrypted EdDSA and XDH keys
2023-09-18 09:31:08 +02:00
Moritz Halbritter
7bd9780f71 Merge pull request #37436 from izeye
* pr/37436:
  Polish SimpleAsyncTaskExecutorBuilder

Closes gh-37436
2023-09-18 08:33:04 +02:00
Johnny Lim
9cb89e3366 Polish SimpleAsyncTaskExecutorBuilder
See gh-37436
2023-09-18 08:31:41 +02:00
Andy Wilkinson
6094212217 Defer accessing loop resources until web server start
Closes gh-37209
2023-09-15 17:49:44 +01:00
Moritz Halbritter
577e92a3ef Merge branch '3.1.x' 2023-09-15 15:39:58 +02:00
Moritz Halbritter
85e322b401 Merge branch '3.0.x' into 3.1.x 2023-09-15 15:39:41 +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
f93a497cc6 Merge branch '3.1.x'
Closes gh-37423
2023-09-15 15:18:46 +02:00
Moritz Halbritter
ed4b6aaa7b Merge branch '3.0.x' into 3.1.x
Closes gh-37422
2023-09-15 15:18:08 +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
Johnny Lim
8f4ccb0535 Polish
See gh-37393
2023-09-15 11:44:06 +01:00
Andy Wilkinson
7424e845d1 Merge branch '3.1.x'
Closes gh-37402
2023-09-15 10:46:56 +01:00
Andy Wilkinson
c187bd928a Don't add runtime shutdown hook till app with hook enabled is run
Previously, the runtime shutdown hook was added as soon as a
shutdown handler was registered. This causes a memory leak in a war
deployment when the application is undeployed as
LoggingApplicationListener always registers a shutdown handler
so the runtime shutdown hook was always registered.

This commit updates the shutdown hook so that the runtime shutdown
hook is only allowed to be added once run() has been called on a
SpringApplication with the shutdown hook enabled. This approach
allows the registerShutdownHook flag on SpringApplication to be a
central point of control for the registration of the runtime shutdown
hook. When that flag is set to false, for example by
SpringBootServletInitializer, the runtime shutdown hook will not
be registered, irrespective of whether other code uses the public
API to add a shutdown handler.

An alternative approach of stopping LoggingApplicationListener from
adding its shutdown handler – for example by adding
logging.register-shutdown-hook=false to the environment – was
considered. This approach was rejected in favor of the centralized
approach described above as it would require every caller that adds
a shutdown handler to deal with the problem.

Closes gh-37096
2023-09-15 08:37:56 +01:00
Stephane Nicoll
4243456590 Fix deprecation in Spring Framework 2023-09-13 17:14:46 +02:00