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
49e0d17a9b
Disable flaky reactor tests
...
See gh-36302
2023-08-22 11:38:26 +02:00
c3558689c7
Merge branch '3.1.x'
...
Closes gh-37063
2023-08-22 10:35:41 +02:00
6780b80673
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37062
2023-08-22 10:35:33 +02:00
eed6e199fc
Polish "Detect logback config location as xml if path ends with .xml"
...
See gh-37039
2023-08-22 10:33:03 +02:00
c9cc1da48e
Detect logback config location as xml if path ends with .xml
...
See gh-37039
2023-08-22 10:06:29 +02:00
d46a58f0f6
Configure Virtual Threads support in Reactor
...
This commit configures the virtual threads support in Reactor Core for
Schedulers if:
* the current JDK is 21 or higher
* the current environment enables this globally with the
`"spring.threads.virtual.enabled"` property.
This needs to happen early in the application startup process, as this
feature is detected statically when the first schedulers call is made.
As a result, this is being done with an environment post processor and
not with an auto-configuration class.
Closes gh-36302
2023-08-21 16:43:41 +02:00
2ee1c1eeac
Merge branch '3.1.x'
...
Closes gh-37023
2023-08-17 17:14:41 +02:00
958f92495d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37022
2023-08-17 17:14:30 +02:00
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
7043c82e6d
Merge branch '3.1.x'
...
Closes gh-36970
2023-08-14 15:20:57 +02:00
5764525a60
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36969
2023-08-14 15:20:50 +02:00
fe12e75955
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36968
2023-08-14 15:20:40 +02:00
e043fe434a
Update copyright year of changed file
...
See gh-36965
2023-08-14 15:13:32 +02:00
3ad0e77db8
Align javadoc of AbstractFilterRegistrationBean#setDispatcherTypes
...
See gh-36965
2023-08-14 15:13:04 +02:00
8edec21a6f
Update copyright year of changed files
2023-08-13 20:44:44 -07:00
d73d8f8e4f
Merge branch '3.1.x'
2023-08-13 19:15:56 -07:00
848a61a3a8
Merge branch '3.0.x' into 3.1.x
2023-08-13 18:50:33 -07:00
a0089c5c76
Merge branch '2.7.x' into 3.0.x
2023-08-13 18:44:36 -07:00
46773dd5df
Update copyright year of changed files
2023-08-13 18:19:05 -07:00
527b2f2cac
Polish
2023-08-13 18:18:48 -07:00
fbd3b65034
Refactor synchronized to Lock in ApplicationTemp
...
The synchronized guards an I/O operation. Additionally, this adds
double-checked locking to the path instance field.
See gh-36670
2023-08-10 11:34:18 +02:00
bcee354f54
Refactor synchronized to Lock in ConfigTreePropertySource
...
The synchronized guards an I/O operation. This code path can be
triggered every time a user calls .getProperty() on the Environment.
See gh-36670
2023-08-10 11:27:04 +02:00
5b00d5f89b
Auto-configure SimpleAsyncTaskScheduler when virtual threads are enabled
...
This auto-configures a new SimpleAsyncTaskSchedulerBuilder bean in the
context. This bean is configured to use virtual threads, if enabled.
SimpleAsyncTaskSchedulerCustomizers can be used to customize the built
SimpleAsyncTaskScheduler.
If virtual threads are enabled, the application task scheduler is
configured to be a SimpleAsyncTaskScheduler.
Adds a new configuration property spring.task.scheduling.simple
.concurrency-limit
Closes gh-36609
2023-08-09 13:43:08 +02:00
bd0652f8db
Merge branch '3.1.x'
...
Closes gh-36857
2023-08-09 12:07:33 +01:00
0c9e6268d5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36856
2023-08-09 12:01:00 +01:00
f82f4d6b56
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36855
2023-08-09 12:00:45 +01:00
694ff4f875
Include throwables from Logback errors when reporting invalid config
...
Closes gh-32562
2023-08-09 11:43:58 +01:00
38dbc644ae
Add auto-configuration for JdbcClient
...
Closes gh-36579
2023-08-09 11:18:25 +02:00
4aaca291de
Remove MD5 from RandomValuePropertySource
...
Before that change, we get 32 random bytes, and then used MD5 on them to
get a hex string. This removes the MD5, we now get 128 bits (output size
of MD5) of random bytes directly.
2023-08-08 14:13:26 +02:00
7bb337aeb1
Polish tests
2023-08-08 13:12:47 +02:00
ed9169501e
Polish
2023-08-08 13:12:47 +02:00
41a69c870c
Merge branch '3.1.x'
...
Closes gh-36787
2023-08-08 11:29:20 +01:00
ed89272585
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36786
2023-08-08 11:29:11 +01:00
34b2de3095
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36785
2023-08-08 11:28:59 +01:00
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
85f74ba564
Merge branch '3.1.x'
...
Closes gh-36760
2023-08-04 16:07:48 +02:00
ac1d8a3651
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36759
2023-08-04 16:07:40 +02:00
DevSeoRex
Andy Wilkinson
Phillip Webb
Johnny Lim
Tadaya Tsuyukubo
Moritz Halbritter
Stephane Nicoll
hakan-krgn
Brian Clozel
Yanming Zhou
abaudat