59493e8306
Fix failing tests following version upgrades
2023-11-20 21:03:17 -08:00
6f3b3fa6f6
Replace Function<String, String> with UnaryOperator<String>
...
See gh-38390
2023-11-20 20:05:03 -08:00
ba56953ea5
Skip ValueObjectBinder if parameter names cannot be discovered
...
Update `ValueObjectBinder` so that it is skipped if parameter names
cannot be discovered. This is much more likely as of Since Spring
Framework 6.1 as it no longer performs ASM parsing to discover names.
Fixes gh-38201
2023-11-13 10:24:06 -08:00
61aecdedd6
Remove Liquibase javax.activation excludes
...
Liquibse no longer declares a dependency on `javax.activation`
(see https://github.com/liquibase/liquibase/issues/4487 ) so we
can now remove our exclusions.
See gh-38274
2023-11-09 11:44:31 -08:00
e3210e72d5
Polish "Report friendly error when failing to find AOT initializer"
...
See gh-38188
2023-11-07 10:37:27 +01:00
8126d2652d
Report friendly error when failing to find AOT initializer
...
See gh-38188
2023-11-07 10:37:13 +01:00
b9946bd029
Merge branch '3.1.x'
...
Closes gh-38243
2023-11-07 10:21:13 +01:00
8932de0fe2
Fix typo
...
See gh-38241
2023-11-07 10:07:14 +01:00
d6c28b3fc7
Merge branch '3.1.x'
...
Closes gh-38198
2023-11-03 12:28:38 +01:00
fb1a4ba470
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38197
2023-11-03 12:28:22 +01:00
6b69525291
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38196
2023-11-03 12:28:11 +01:00
18f9dc9b94
Document that customizers are not applied to additional connectors
...
Closes gh-38183
2023-11-03 12:27:55 +01:00
9eda564d06
Fix check for using CoordinatedRestoreAtCheckpointStartup
...
Closes gh-38186
2023-11-03 09:58:13 +00:00
99986a2fdd
Polish SSL internals
2023-11-02 14:41:06 -05:00
d3f177be71
Polish SSL
2023-11-02 09:36:06 +01:00
a35fb7505f
Merge branch '3.1.x'
...
Closes gh-38179
2023-11-01 18:22:39 -07:00
683d791104
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38178
2023-11-01 18:22:28 -07:00
e5c8723dda
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38177
2023-11-01 18:22:06 -07:00
eecb15d1ba
Rename startDaemonAwaitThread() inside TomcatWebServer to match intent
...
Closes gh-38155
2023-11-01 18:21:36 -07:00
9b71ef4114
Polish and refactor some SSL internals
...
Polish and refactor some of the internal SSL code to make it easier to
add additional functionality in the future.
2023-11-01 16:14:59 -07:00
30a7426e86
Apply key property to the keystore and not to the truststore
...
Update `PropertiesSslBundle` so that key properties are now
only applied to the keystore and not the truststore.
Closes gh-38125
2023-11-01 16:10:51 -07:00
1b61bc1f20
Move PEM verification to spring-boot-autoconfigure
...
Move `KeyVerifier` to spring-boot-autoconfigure to reduce the
public API required in `PemSslStoreBundle`.
This commit also moves the verify property so that is can be set
per store.
Closes gh-38173
2023-11-01 16:10:16 -07:00
5e5d2265f5
Introduce `PemSslStore` as an alternative to `PemSslStoreDetails`.
...
Add a `PemSslStore` interface that can be used as an alternative
to `PemSslStoreDetails` when PEM content has already been loaded
and parsed.
Closes gh-38175
2023-11-01 16:06:28 -07:00
2b39ec6f60
Introduce a public `PemContent` class
...
Update `PemContent` so that it now holds PEM data and is public.
This update is required so that in the future we can make use of
our PEM parsing code in spring-boot-autoconfigure.
Closes gh-38174
2023-11-01 16:02:51 -07:00
2c6fca8df7
Allow alias and password to be configured on a per PEM store basis
...
Closes gh-38124
2023-11-01 16:02:33 -07:00
8bf847e549
Rename keyAlias parameter to alias
...
Rename the keyAlais parameter to alias since it may be used as either
the key alias or the certificate alias.
Also clarify the javadoc for keyPassword.
Closes gh-38099
2023-11-01 16:01:46 -07:00
173e6543fd
Merge branch '3.1.x'
...
Closes gh-38168
2023-11-01 15:06:20 +00:00
40ce6182a1
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38167
2023-11-01 15:03:29 +00:00
b7f00c1087
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38166
2023-11-01 15:02:54 +00:00
990afd844f
Fix typos in method names
...
See gh-38153
2023-11-01 14:59:49 +00:00
20edbb402f
Merge branch '3.1.x'
2023-10-31 10:23:13 +01:00
607ed86edb
Merge branch '3.0.x' into 3.1.x
2023-10-31 10:23:01 +01:00
3d4a9dd059
Polish StandardConfigDataResource
2023-10-31 09:49:01 +01:00
e7c26b9410
Polish BeanDefinitionLoader
2023-10-31 09:49:01 +01:00
1b6431c219
Fix shouldStopKeepAliveThreadIfContextIsClosed()
...
See gh-38103
2023-10-30 09:26:16 +01:00
5ff4a961b1
Polish 0fbb1f7890
...
See gh-38029
2023-10-26 15:18:02 +02:00
8095c2a94b
Polish "Extract "server.ports" hardcoding into a constant"
...
See gh-38029
2023-10-26 14:35:02 +02:00
01e2f70c73
Extract "server.ports" hardcoding into a constant
...
See gh-38029
2023-10-26 14:31:57 +02:00
0950d4416a
Pass in filter's name when adding to MockMvc
...
Closes gh-38001
2023-10-24 12:39:42 +01:00
7bd9989614
Fix merge conflict errors
...
See gh-37999
2023-10-23 19:40:44 -07:00
2ac69160c7
Revert "Allow PemPrivateKeyParser to parse multiple keys"
...
This reverts commit 32e6ce210e
2023-10-23 18:32:12 -07:00
b5d4983829
Polish
...
See gh-37984
2023-10-23 11:15:27 +02:00
9897576562
Polish d22969ae
...
The current threads must be retrieved each time so that we can see
the keep-alive thread dying.
See gh-37736
2023-10-20 12:57:17 +01:00
d22969ae09
Tolerate race condition in shouldStopKeepAliveThreadIfContextIsClosed
...
See gh-37736
2023-10-20 10:19:34 +01:00
3eeb1b2849
Merge branch '3.1.x'
2023-10-19 23:21:42 -07:00
9f3afb3636
Merge branch '3.0.x' into 3.1.x
2023-10-19 23:21:20 -07:00
7c864804d5
Merge branch '2.7.x' into 3.0.x
2023-10-19 23:21:08 -07:00
d47f8bf945
Update copyright year of changed files
2023-10-19 23:20:43 -07:00
25ce0ef3fc
Refine `PemContent` and PEM parsers
2023-10-19 23:19:45 -07:00
32e6ce210e
Allow PemPrivateKeyParser to parse multiple keys
...
Update `PemPrivateKeyParser` so that it can parse multiple keys in a
single PEM file.
Closes gh-37970
2023-10-19 22:01:23 -07:00
deb79425ee
Polish
2023-10-19 21:47:13 -07:00
d638bbb0ba
Merge branch '3.1.x'
...
Closes gh-37967
2023-10-19 21:25:44 -07:00
1d456e09d2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37966
2023-10-19 21:12:52 -07:00
a0b999c8b4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37965
2023-10-19 20:55:51 -07:00
abdad1cabe
Constently use assertThatExceptionOf... assertions
...
Closes gh-37964
2023-10-19 20:17:26 -07:00
e25886f2de
Consider checkpoint restoration when logging start time and uptime
...
Closes gh-37084
2023-10-19 19:54:58 +01:00
af2e363252
Merge branch '3.1.x'
...
Closes gh-37942
2023-10-18 18:50:52 +01:00
226221073c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37941
2023-10-18 18:39:29 +01:00
a25472ab5b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37940
2023-10-18 18:39:16 +01:00
817debb1ee
Fix constructor binding with conversion to custom collection type
...
Closes gh-37734
2023-10-18 17:47:26 +01:00
8d006f82f7
Merge branch '3.1.x'
...
Closes gh-37939
2023-10-18 17:46:19 +01:00
9219fdc638
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37938
2023-10-18 17:44:30 +01:00
865203f902
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37937
2023-10-18 17:37:37 +01:00
04307aa7e0
Polish "Support @Order on [CommandLine|Application]Runner @Bean definitions"
...
See gh-37905
2023-10-18 17:16:48 +01:00
8ac597c245
Support @Order on [CommandLine|Application]Runner @Bean definitions
...
Prior to this commit, `@Order` annotation on `@Bean` method was not
considered for `CommandLineRunner` and `ApplicationRunner`.
This commit introduces a `Runner` marker interface and uses it to
retrieve the runner beans. As a result, it enables the use of `@Order`
annotations on `@Bean` methods for both `CommandLineRunner` and
`ApplicationRunner`.
Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>
See gh-37905
2023-10-18 17:15:15 +01:00
daa903ab31
Add filters to MockMvc with their init params and dispatcher types
...
Closes gh-37835
2023-10-17 17:54:36 +01:00
9f224ff136
Narrow the scope of 0e3a196 to Resource[] for array binding
...
See gh-15835
2023-10-16 18:18:34 +01:00
19fd88b25b
Implement SSL hot reload for Netty and Tomcat
...
Closes gh-37808
2023-10-16 14:08:26 +01:00
0e3a196af5
Fix binding of classpath*: to resource arrays and collections
...
Fixes gh-15835
2023-10-16 11:28:35 +01:00
085e12aa93
Merge branch '3.1.x'
...
Closes gh-37884
2023-10-13 16:39:21 +01:00
0c1b5d1295
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37883
2023-10-13 16:39:02 +01:00
e314e11985
Fix AOT processing of @MultipartConfig annotated @WebServlet
...
Closes gh-37637
2023-10-13 16:22:38 +01:00
fcf77ed65d
Add property to stop the JVM from exiting
...
spring.main.keep-alive=true will spawn a non-daemon thread which stops
if the context is closed
Closes gh-37736
2023-10-12 17:02:47 +02:00
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
1d410dccea
Adapt to breaking API change in Framework
...
See gh-37710
2023-10-10 17:21:33 +01:00
15ee305ef3
Upgrade to Jetty 12.0.2
...
Closes gh-37803
2023-10-10 16:42:35 +01:00
0a16ec17e9
Add property to enable key verification on PEM SSL bundles
...
Closes gh-37727
2023-10-05 09:49:49 +02:00
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
7d40a45b50
Merge branch '3.1.x'
...
Closes gh-37662
2023-10-03 11:21:29 +01:00
a4100e12ff
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37661
2023-10-03 11:05:51 +01:00
931584f8af
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37659
2023-10-03 10:28:51 +01:00
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
d725914cd5
Merge branch '3.1.x'
...
Closes gh-37636
2023-09-29 18:36:25 +01:00
1e4deed8ce
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37635
2023-09-29 18:36:09 +01:00
458418be29
Automatically register reflection hints for scanned WebListeners
...
Closes gh-36008
2023-09-29 18:09:36 +01:00
145fb161a1
Merge branch '3.1.x'
...
Closes gh-37601
2023-09-27 12:50:58 +01:00
0368fc5678
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37600
2023-09-27 12:38:21 +01:00
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
ab06d10d64
Fix checkpoint-restore with replaced or wrapped HikariDataSource
...
Closes gh-37580
2023-09-26 12:31:12 +01:00
11ec9f95f6
Merge branch '3.1.x'
...
Closes gh-37571
2023-09-25 11:40:16 +02:00
02f71d8e95
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37570
2023-09-25 11:39:29 +02:00
b93ce92022
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37569
2023-09-25 11:39:18 +02:00
b266ade00c
Prevent exception when loading optional config data locations
...
Closes gh-35683
2023-09-25 11:39:04 +02:00
279f1e2d0f
Merge branch '3.1.x'
...
Closes gh-37514
2023-09-21 16:44:22 +02:00
ddd666497d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37513
2023-09-21 16:44:14 +02:00
dc8e69cc8d
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37512
2023-09-21 16:44:05 +02:00
b95092c621
Fix wrong mocking
...
See gh-37492
2023-09-21 16:42:43 +02:00
f55184a998
Update copyright year of changed files
2023-09-20 17:16:31 -07:00
b87e47e90c
Merge branch '3.1.x'
...
Closes gh-37485
2023-09-20 10:56:35 +01:00
e10ca23b41
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37484
2023-09-20 10:56:20 +01:00
2a3d5c4e0e
Tolerate parallel init of SLF4J
...
Closes gh-37477
2023-09-20 10:49:01 +01:00
d4fe3bfea7
Merge branch '3.1.x'
...
Closes gh-37446
2023-09-18 14:24:54 +02:00
af244e1550
Start Threshold filters in DefaultLogbackConfiguration
...
Closes gh-36741
2023-09-18 14:11:09 +02:00
4c4fdb35e9
Merge branch '3.1.x'
2023-09-18 09:53:17 +02:00
3900c0ad58
Merge branch '3.0.x' into 3.1.x
2023-09-18 09:53:07 +02:00
9a1e146c86
Polish PrivateKeyParserTests
2023-09-18 09:51:39 +02:00
2367990150
Merge branch '3.1.x'
2023-09-18 09:49:52 +02:00
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
7bd9780f71
Merge pull request #37436 from izeye
...
* pr/37436:
Polish SimpleAsyncTaskExecutorBuilder
Closes gh-37436
2023-09-18 08:33:04 +02:00
9cb89e3366
Polish SimpleAsyncTaskExecutorBuilder
...
See gh-37436
2023-09-18 08:31:41 +02:00
6094212217
Defer accessing loop resources until web server start
...
Closes gh-37209
2023-09-15 17:49:44 +01:00
577e92a3ef
Merge branch '3.1.x'
2023-09-15 15:39:58 +02:00
85e322b401
Merge branch '3.0.x' into 3.1.x
2023-09-15 15:39:41 +02:00
1b098951aa
Merge branch '2.7.x' into 3.0.x
2023-09-15 15:39:28 +02:00
36629df416
Remove useless file
2023-09-15 15:39:18 +02:00
f93a497cc6
Merge branch '3.1.x'
...
Closes gh-37423
2023-09-15 15:18:46 +02:00
ed4b6aaa7b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37422
2023-09-15 15:18:08 +02:00
5be826dd4a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37413
2023-09-15 14:47:57 +02:00
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
8f4ccb0535
Polish
...
See gh-37393
2023-09-15 11:44:06 +01:00
7424e845d1
Merge branch '3.1.x'
...
Closes gh-37402
2023-09-15 10:46:56 +01:00
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
4243456590
Fix deprecation in Spring Framework
2023-09-13 17:14:46 +02:00
d7f44164d9
Merge branch '3.1.x'
2023-09-13 11:16:48 +01:00
b9c223581e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37364
2023-09-13 11:15:33 +01:00
eba2f718a7
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37363
2023-09-13 11:15:16 +01:00
13a3e3bdf0
Add TWENTY_ONE to JavaVersion
...
Closes gh-37362
2023-09-13 11:04:22 +01:00
8874cadebf
Revert workaround for gh-18440
...
This reverts the main code changes from commit
b240c810a8
2023-09-12 13:43:27 +01:00
8a1f6d4f32
Merge branch '3.1.x'
...
Closes gh-37335
2023-09-11 16:50:44 +02:00
24eadd70ed
Adapt to Spring Framework API change
...
This commit adapts to API changes in Spring Framework, see
spring-projects/spring-framework#31117
Previously, the "autowired" executable to use for a bean was always
resolved, even if a custom code fragment didn't really need it. This
is key for binding of immutable configuration properties as we use an
instance supplier for it.
This changes means that the workaround added in maintenance releases
can be removed.
See gh-37337
2023-09-11 16:03:27 +02:00
e2d84fa462
Make SslStoreBundle implementations immutable
...
Closes gh-37222
2023-09-11 15:39:25 +02:00
671b04e3e3
Merge branch '3.1.x'
...
Closes gh-37337
2023-09-11 15:37:53 +02:00
c298091e34
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37336
2023-09-11 15:37:43 +02:00
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
1ffb580d6f
Upgrade to Commons DBCP2 2.10.0
...
Closes gh-37312
2023-09-11 15:15:57 +02:00
d8c3902a7e
Polish
2023-09-08 14:56:18 +01:00
4bd8c350f2
Start building against Spring Framework 6.0.12 snapshots
...
See gh-37265
2023-09-08 14:14:06 +01:00
ca254e51f6
Start building against Spring Framework 6.0.12 snapshots
...
See gh-37258
2023-09-08 12:07:43 +01:00
ed5d16de84
Upgrade to Jetty 12
...
Closes gh-36073
2023-09-07 13:59:15 +01:00
02fd570b7d
Start building against Spring Framework 6.1.0 snapshots
...
See gh-37231
2023-09-07 13:34:14 +01:00
b1547d0139
Merge branch '3.1.x'
...
Closes gh-37171
2023-08-31 22:38:29 -07:00
37e67058b7
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37169
2023-08-31 22:24:14 -07:00
71ed31343c
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37168
2023-08-31 22:01:06 -07:00
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
208dcb9305
Rename tests now that Jetty is preferred
...
Closes gh-37155
2023-08-31 11:06:54 +01:00
f6c88662b4
Merge branch '3.1.x'
...
Closes gh-37144
2023-08-30 13:36:01 +01:00
e6fcde4af5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37143
2023-08-30 13:35:40 +01:00
a8e37b5cc5
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37142
2023-08-30 13:34:12 +01:00
2de98a84bc
Polish "Polish code and javadoc"
...
See gh-37112
2023-08-30 13:31:58 +01:00
6d9ce8a3b5
Polish code and javadoc
...
See gh-37112
2023-08-30 13:31:58 +01:00
Phillip Webb
abdullah-jaffer
Claudio Nave
Moritz Halbritter
Yanming Zhou
Jake
Andy Wilkinson
Scott Frederick
Christoph Dreis
Johnny Lim
DevSeoRex
Tadaya Tsuyukubo
Stephane Nicoll
hakan-krgn