b536b209ab
Refine assertions on exception messages
2022-06-14 18:20:27 +02:00
b0f5fb51fc
Adapt to deprecation of NestedServletException
2022-06-14 17:45:31 +02:00
b1ea82c1e2
Merge branch '2.7.x'
...
Closes gh-31380
2022-06-14 11:17:30 +01:00
6de4ade0cf
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31379
2022-06-14 11:16:57 +01:00
5d7cab09b8
Revert BindConverter changes that are now handled by Framework
...
See gh-28592 and spring-projects/spring-framework#28609
Closes gh-31343
2022-06-14 10:37:35 +01:00
063e56dbff
Polish
2022-06-13 09:44:02 +02:00
380776a9b2
Merge branch '2.7.x'
2022-06-10 16:13:50 -07:00
7bf82b5349
Merge branch '2.6.x' into 2.7.x
2022-06-10 16:13:35 -07:00
63fdd729f5
Refine conversion service type check
...
Update fix to account for primitive types.
See gh-28592
2022-06-10 16:12:38 -07:00
8937924508
Merge branch '2.7.x'
...
Closes gh-31342
2022-06-10 14:30:28 -07:00
beb1c15219
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31341
2022-06-10 14:30:02 -07:00
31b0264d94
Ensure conversion service actually converts to the correct type
...
Update `BindConverter` with a guard to ensure that the resulting object
is the correct type.
Fixes gh-28592
2022-06-10 14:29:25 -07:00
cb745b4259
Merge branch '2.7.x'
...
Closes gh-31340
2022-06-10 12:43:38 -07:00
ed1e7382ab
Fix typo in ImportCandidates javadoc
...
See gh-31277
2022-06-10 12:42:43 -07:00
c56783064d
Support management contexts with AOT
...
Refactor child management configuration and add AOT generation support.
A new `ChildManagementContextInitializer` class now performs the child
context initialization and also handles AOT processing concerns.
Closes gh-31163
2022-06-08 19:24:46 -07:00
a729f71cba
Polish LogbackRuntimeHintsRegistrar
2022-06-08 19:24:45 -07:00
e30391ca7a
Use Application as target for generated code
...
Closes gh-31274
2022-06-08 14:51:17 +02:00
8413002bcb
Polish
...
See gh-31247
2022-06-07 20:02:06 +02:00
869bb91c80
Polish
2022-06-07 17:52:11 +01:00
ac16432fad
Add AOT support for immutable ConfigurationProperties bean definitions
...
This commit introduces a dedicated AotProcessors for immutable
configuration properties beans as their bean definition use an
instance supplier that needs special handling. If such a bean definition
is detected, dedicated code is generated that replicates the behavior
of the instance supplier.
Closes gh-31247
2022-06-07 14:26:35 +02:00
3f0c14187a
Register runtime hints for @ConfigurationProperties
...
Prior to this commit, the `@ConfigurationProperties` annotation would
not be registered for reflection hints: this means it could be missing
at runtime in a native image and would not be registered for JDK
proxying - this can fail the synthesized annotation resolution.
This commit ensures that hints are registered for this annotation if
configuration properties are declared in the bean factory.
Fixes gh-31227
2022-06-07 09:50:56 +02:00
c996e4335a
Fix singleton handling of ConfigurationProperties hints
...
Closes gh-31248
2022-06-04 12:29:45 +02:00
2a405c94a8
Add missing test
...
Closes gh-31249
2022-06-03 17:41:29 +02:00
fb439b6824
Permit AOT-generated code to run on the JVM as well
...
This commit updates the codebase so that AOT-generated code can run on
the JVM in an opt-in fashion alongside the existing support of native
images.
When optimizations have been generated, setting the "spring.aot.enabled"
spring property (JVM or spring.properties) allows to opt-in for that
behavior on the JVM.
Closes gh-31244
2022-06-03 10:10:56 +02:00
13fba65638
Polish
2022-06-01 09:53:21 -07:00
6d80723598
Relocate AotProcessingHook
...
Relocate `AotProcessingHook` to be an static class of `AotProcessor`.
2022-05-31 15:51:12 -07:00
4385926df1
Ensure that the main application class can be deduced
...
Closes gh-31222
2022-05-31 12:06:56 +01:00
5f54289e97
Allow WebApplicationType to be deduced in a native image
...
Closes gh-31217
2022-05-31 11:39:42 +01:00
44a8e91b9e
Prevent main method to continue once the AOT context has been optimized
...
This commit makes sure that processing of the main method upon
completion of SpringApplication#run. Previously, any instructions in
the user's main method were invoked, which is not suitable to build-time
processing.
Closes gh-31219
2022-05-31 12:34:37 +02:00
d044eaf69d
Merge branch '2.7.x'
...
Closes gh-31221
2022-05-31 11:21:52 +01:00
7f291f8da0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31220
2022-05-31 11:14:08 +01:00
348662b15e
Remove unused deduceFromApplicationContext and supporting code
...
Closes gh-31218
2022-05-31 10:57:22 +01:00
f433d250e1
Merge branch '2.7.x'
...
Closes gh-31189
2022-05-27 11:14:40 +01:00
d2397bd34e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31188
2022-05-27 11:14:29 +01:00
83e8c039b3
Add application/wasm to MIME mappings
...
Closes gh-30885
2022-05-27 11:14:04 +01:00
df99ad17bd
Merge branch '2.7.x'
...
Closes gh-31184
2022-05-27 10:09:28 +01:00
194e9f0f79
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31183
2022-05-27 10:02:08 +01:00
56c3a5f0ab
Polish "Assert that sources does not contain null elements"
...
See gh-30878
2022-05-27 10:01:06 +01:00
ebf276c005
Assert that sources does not contain null elements
...
See gh-30878
2022-05-27 10:00:32 +01:00
4bb5ba2bd0
Merge branch '2.7.x'
2022-05-26 18:26:52 +01:00
935d1264e0
Merge branch '2.6.x' into 2.7.x
2022-05-26 18:13:08 +01:00
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
5dfa5adb75
Merge branch '2.7.x'
...
Closes gh-31178
2022-05-26 15:54:58 +01:00
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
b3a4982f31
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31174
2022-05-26 14:01:23 +01:00
cbf42dea14
Update deprecation messages to change removal version from 2.8 to 3.0
...
Closes gh-30903
2022-05-26 13:59:03 +01:00
f8a41d34aa
Merge branch '2.7.x'
2022-05-17 22:22:08 -07:00
23eceb0d8a
Merge branch '2.6.x' into 2.7.x
2022-05-17 22:21:41 -07:00
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
2022-05-17 22:21:10 -07:00
7d2f1bafc0
Update copyright year of changed files
2022-05-17 22:20:05 -07:00
ea881aadc6
Merge branch '2.7.x'
2022-05-17 22:19:08 -07:00
13670e556b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31095
2022-05-17 22:18:53 -07:00
0beccde6ee
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31094
2022-05-17 22:18:38 -07:00
7da42d7139
Allow tests to pass when a NAME environment variable exists
...
Update `ConfigurationPropertiesTests` so that it will pass even if a
local `NAME` environment variable is declared.
Closes gh-31076
2022-05-17 22:16:24 -07:00
e83ed4fe5e
Merge branch '2.7.x'
2022-05-17 22:16:02 -07:00
fbde59d635
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31093
2022-05-17 22:14:40 -07:00
6bce0c5044
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31092
2022-05-17 22:14:21 -07:00
44c979beb0
Reorder default property sources after @PropertySource processing
...
Update `SpringApplication` so that the `DefaultPropertiesPropertySource`
is moved to the end after `@PropertySource` annotations have been
processed. This restores functionality that used to be handled by
the `ConfigFileApplicationListener` and was inadvertently dropped
when the `ConfigDataEnvironmentPostProcessor` was developed.
Fixes gh-31068
2022-05-17 22:13:49 -07:00
06f8041e4d
Merge branch '2.7.x'
2022-05-17 21:50:42 -07:00
d5d5997be7
Merge branch '2.6.x' into 2.7.x
2022-05-17 21:49:20 -07:00
99f5c781a5
Merge branch '2.5.x' into 2.6.x
2022-05-17 21:48:50 -07:00
350d27fe50
Polish code to use method references when possible
2022-05-17 21:16:42 -07:00
bcc27c5d22
Deleting existing output before running AOT processing
...
Closes gh-30981
2022-05-17 15:33:45 +01:00
74a8fffe9f
Polish LogbackRuntimeHintsRegistrarTests
...
See gh-31074
2022-05-17 13:28:26 +02:00
6c4fedb4a4
Revert "Logback 1.3 and SLF4J 2.0"
...
This reverts commit f39a080a0e
2022-05-13 16:23:48 +01:00
f39a080a0e
Logback 1.3 and SLF4J 2.0
2022-05-13 14:48:20 +01:00
4cb9d95b49
Use ProcessHandler to get the process ID
...
Closes gh-28178
2022-05-13 14:35:41 +01:00
48c948973d
Polish
2022-05-12 12:12:22 +01:00
d0e55643b1
Polish
...
Closes gh-30993
2022-05-12 12:11:51 +01:00
1fd9c4d82c
Polish
...
Closes gh-30992
2022-05-12 12:10:52 +01:00
624c41c80e
Polish
...
See gh-30862
2022-05-12 12:07:12 +01:00
c2a3652709
Merge branch '2.7.x'
2022-05-12 11:53:46 +01:00
7e88daf288
Update messages for APIs deprecated in 2.7
...
In all likelihood there will not be a 2.9 release so this commit
updates the message for deprecations made in 2.7 to indicate that
removal will not occur until 3.0.
See gh-30903
2022-05-12 11:12:09 +01:00
f6225fe98b
Register reflection hints for Logback
...
Closes gh-30975
2022-05-11 12:34:47 +01:00
9a239c10b5
Align tests with changes to SpringApplicationHooks
2022-05-11 11:08:26 +01:00
2744649892
Update started log message as app may not be running on a JVM
...
Closes gh-30974
2022-05-11 11:08:25 +01:00
c7590277a9
Polish
2022-05-10 19:03:57 -07:00
693941c2c2
Polish SpringFactories ArgumentResolver code
...
Update `ArgumentResolver` setup to use one statement per line
and throw an exception if `Log` parameter types are present.
2022-05-10 17:43:52 -07:00
cffdee72ca
Polish
2022-05-10 16:13:16 +01:00
566ed68403
Contribute reflection hints for configuration property binding
...
Closes gh-30916
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
2022-05-10 15:31:15 +01:00
dbf0bcca63
Avoid reflection when Tomcat's configuring Context's ClassLoader
...
Closes gh-30904
2022-05-10 15:22:37 +01:00
87e78691c4
Use AOT-generated initialization when running in a native image
...
Closes gh-30915
2022-05-10 15:22:16 +01:00
c91b787078
Uses non-AnnotationConfig contexts when using AOT-generated init
...
Closes gh-30914
2022-05-10 15:19:29 +01:00
770cb840c3
Use more flexible SpringFactoriesLoader
...
Closes gh-30235
Co-authored-by: Madhura Bhave <bhavem@vmware.com>
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
2022-05-09 14:13:04 +01:00
3980c5af48
Polish "Use Log4jBridgeHandler to route JUL-based logging into Log4j 2"
...
See gh-30003
2022-05-06 15:05:16 +01:00
728e27d193
Use Log4jBridgeHandler to route JUL-based logging into Log4j 2
...
Since version 2.15.0 `log4j-jul` contains a `Log4jBridgeHandler`,
that forwards JUL to Log4j 2.x and synchronizes the logger levels of
the two frameworks.
This commmit adds support for the `Log4jBridgeHandler` and sets it as
the bridge handler for the Log4j 2.x stack, replacing the existing
JUL to SLF4J bridge that was used previously.
See gh-30003
2022-05-06 15:05:08 +01:00
8cf63a28b8
Update AOT work to latest Framework code
2022-05-05 15:19:33 -07:00
7a0e5a032d
Delete unused test configuration files
...
These files were used by the legacy ConfigFileApplicationListener tests
and are no longer needed
2022-05-05 11:57:37 -07:00
8d6b442dc4
Remove support for spring.profiles
...
Closes gh-22523
2022-05-05 11:57:37 -07:00
2369ce4195
Remove dependency management for AppEngine SDK
...
Closes gh-30638
2022-05-04 16:31:00 -05:00
7dd8dfc197
Handle zero-offset timezone in logging test
...
See gh-28654
2022-05-03 17:48:09 -05:00
7f395941c7
Add timezone offset to default logging date format patterns
...
Closes gh-28654
2022-05-03 17:09:27 -05:00
541ab69aff
Merge branch '2.7.x'
2022-05-03 15:18:20 +01:00
4cd850cfc0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30851
2022-05-03 15:17:13 +01:00
fa327a783d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30850
2022-05-03 15:14:00 +01:00
4fd2e0c916
Polish "Fix typos"
...
See gh-30773
2022-05-03 14:09:53 +01:00
f6d24dc1a8
Fix typos
...
See gh-30773
2022-05-03 14:09:37 +01:00
096420cc4c
Generate native image config data in recommended location
...
Closes gh-30827
2022-04-28 13:38:28 +01:00
97589d0465
Introduce Hook-based AOT processing
...
Closes gh-30555
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
2022-04-27 11:26:01 +01:00
9cd17f8a14
Introduce hooking of SpringApplication
...
Closes gh-30538
2022-04-27 10:53:54 +01:00
3987deccde
Merge branch '2.7.x'
2022-04-25 14:11:40 +01:00
3c5cea47d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30789
2022-04-25 14:11:21 +01:00
3f23c08268
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30788
2022-04-25 14:11:08 +01:00
ce788657ce
Improve diagnostics for map binding failures
...
Closes gh-30281
2022-04-25 13:50:09 +01:00
4e193dc574
Merge branch '2.7.x'
2022-04-25 12:36:44 +01:00
d0c9d5aabc
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30787
2022-04-25 12:36:30 +01:00
5c3be7c61e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30786
2022-04-25 12:36:14 +01:00
ffe0ec6d4d
Use SearchStrategy in MethodValidationExcludeFilter byAnnotation
...
Closes gh-30631
2022-04-25 12:35:41 +01:00
cd4ee99756
Merge branch '2.7.x'
2022-04-20 16:30:15 -07:00
504c4a33db
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30763
2022-04-20 16:29:58 -07:00
c5d650a807
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30762
2022-04-20 16:29:24 -07:00
77edb27a07
Fix package tangle caused by ApplicationContextFactory
...
Fix package tangle by changing `ApplicationContextFactory.DEFAULT` to
use `spring.factories` to discover implementations rather than needing
direct access to our own `ApplicationContext` classes.
Closes gh-30272
2022-04-20 16:28:46 -07:00
7a6ca8ce25
Merge branch '2.7.x'
2022-04-20 15:30:01 -07:00
dd5696b59b
Update copyright year of changed files
2022-04-20 15:26:30 -07:00
a4cccc98c6
Merge branch '2.7.x'
2022-04-19 09:37:08 +02:00
61915aa4d5
Update copyright year of changed files
...
See gh-30695
2022-04-19 09:36:38 +02:00
ed412af138
Polish
...
See gh-30695
2022-04-19 09:34:28 +02:00
6e846384df
Merge branch '2.7.x'
2022-04-19 09:11:31 +02:00
d7b23edf8b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30739
2022-04-19 09:11:23 +02:00
91625207b2
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30738
2022-04-19 09:11:01 +02:00
1fa4701d6d
Polish "Validate overrides against CharsetMapperDefault.properties"
...
See gh-30692
2022-04-19 09:03:54 +02:00
407ae3b04f
Validate overrides against CharsetMapperDefault.properties
...
See gh-30692
2022-04-19 09:03:40 +02:00
6cbb4a4f33
Merge branch '2.7.x'
2022-04-16 09:07:59 +02:00
73b98d0cb8
Polish
2022-04-16 09:07:46 +02:00
c654638654
Polish "Add link to @Order annotation"
...
See gh-30572
2022-04-14 10:39:22 +02:00
c72f3d79af
Add link to @Order annotation
...
See gh-30572
2022-04-14 10:36:33 +02:00
f5f7fc8e9a
Merge branch '2.7.x'
2022-04-13 16:29:00 -05:00
d387b3fa81
Support configuration of web SSL using PEM-encoded certificates
...
This commit adds the ability to configure SSL in embedded web containers
using PEM-encoded certificate and private key files, as an alternative
to configuring SSL with Java KeyStore files.
Closes gh-29273
2022-04-13 16:28:04 -05:00
c37857c6c6
Merge branch '2.7.x'
2022-04-13 14:20:27 +01:00
631b876165
Deprecate DatabaseDriver.GAE
...
Closes gh-29984
2022-04-13 14:19:09 +01:00
77b7f2f1ce
Switch to Spring Framework SNAPSHOTs
...
See gh-30624
2022-04-12 17:02:03 +02:00
b871a1e457
Merge branch '2.7.x'
2022-04-12 08:51:47 +01:00
48f8021d88
Migrate @Local*Port annotations to spring-boot-test
...
Closes gh-29589
2022-04-12 08:48:43 +01:00
0dd9493dc1
Merge branch '2.7.x'
2022-04-07 17:12:14 -05:00
90aee8ef2f
Polish FailureAnalyzers deprecation message
...
Fixes gh-30578
2022-04-07 17:10:45 -05:00
d67dcf16cd
Migrate FailureAnalyzers to constructor injection
...
All `FailureAnalyzer` implementations should use constructor
injection for `BeanFactory` and `Environment` instead of implementing
`BeanFactoryAware` or `EnvironmentAware` interfaces.
Fixes gh-30585
2022-04-07 16:58:59 -05:00
41213a8c4e
Merge branch '2.7.x'
2022-04-07 20:33:30 +01:00
5a26e936de
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30582
2022-04-07 20:31:46 +01:00
a2c08f9f99
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30581
2022-04-07 20:31:22 +01:00
35154a96f3
Polish "Fix NPE in configprops endpoint"
...
See gh-30068
2022-04-07 19:44:06 +01:00
a1fe05f40b
Fix NPE in configprops endpoint
...
This works around spring-projects/spring-framework#28298 . The bug
means that when a @Configuration class is annotated with
@ConfigurationProperties any bean defined by a static @Bean method
is considered to be annotated with @ConfigurationProperties.
See gh-30068
2022-04-07 19:40:29 +01:00
fac2430dff
Merge branch 'gh-30358'
2022-04-07 19:17:27 +01:00
dbc59052ba
Polish "Add failure analyzer for missing web factory bean"
...
See gh-30358
2022-04-07 18:55:04 +01:00
dfafccaba5
Add failure analyzer for missing web factory bean
...
See gh-30358
2022-04-07 18:50:50 +01:00
95c8d7f79d
Merge branch '2.7.x'
2022-04-07 18:50:13 +01:00
febea4711e
Make Reactive and ServletWebServerFactory extend marker interface
...
Closes gh-30579
2022-04-07 18:20:38 +01:00
e6b485b317
Merge branch '2.7.x'
2022-04-07 16:31:58 +01:00
8727361221
Polish "Order ExitCodeGenerators and return first non-zero exit code"
...
See gh-30457
2022-04-07 16:31:19 +01:00
6718b10fa9
Order ExitCodeGenerators and return first non-zero exit code
...
See gh-30457
2022-04-07 16:30:09 +01:00
4307edbb1b
Merge branch '2.7.x'
2022-04-06 10:28:35 +02:00
98bbbc910b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30554
2022-04-06 10:28:24 +02:00
c54b825a82
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30553
2022-04-06 10:28:11 +02:00
035a16278e
Make ApplicationAvailabilityBean threadsafe
...
See gh-30489
2022-04-06 10:26:21 +02:00
43c647e898
Merge branch '2.7.x'
2022-04-05 14:17:14 +02:00
f8c54655f6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30542
2022-04-05 14:17:00 +02:00
53b2c85df0
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30541
2022-04-05 14:16:38 +02:00
65d8c76ac3
Add Tomcat locale mapping for Japanese to preserve UTF-8 charset
...
See gh-30535
2022-04-05 14:15:40 +02:00
92936c6ed3
Merge branch '2.7.x'
2022-04-04 15:27:11 -05:00
103c2bdd7d
Use Tomcat SSLHostConfig API for SSL configuration
...
Closes gh-30531
2022-04-04 15:22:43 -05:00
6fa696f13d
Merge branch '2.7.x'
2022-04-04 14:23:24 +02:00
bd1424b004
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30528
2022-04-04 14:22:49 +02:00
bf3c2d713d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30526
2022-04-04 14:18:45 +02:00
09d6215b65
Polish documentation
...
See gh-30498
2022-04-04 14:09:28 +02:00
fbb060e0fe
Polish
...
See 5d8c1d9bd7
2022-03-29 15:22:01 +01:00
5d8c1d9bd7
Merge branch '2.7.x'
2022-03-29 14:30:42 +01:00
2f3ae02385
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30466
2022-03-29 14:24:42 +01:00
8f985474a6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30465
2022-03-29 14:24:25 +01:00
d574563616
Document @ConstructorBinding and @DefaultValue with records
...
Closes gh-30460
2022-03-29 14:14:28 +01:00
6865f1f3d9
Merge branch '2.7.x'
2022-03-28 09:47:13 +02:00
5466444826
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30450
2022-03-28 09:46:42 +02:00
5dc4ff5366
Update copyright year of changed file
...
See gh-30446
2022-03-28 09:46:21 +02:00
f9d1c400a7
Remove redundant Javadoc
...
See gh-30446
2022-03-28 09:45:33 +02:00
eabf6cd1d8
Merge branch '2.7.x'
2022-03-25 15:15:26 +00:00
685d2d4391
Polish
...
See gh-30152
2022-03-25 15:15:02 +00:00
df417bf317
Simplify registration of Jackson mixin types
...
See gh-30152
2022-03-25 15:15:02 +00:00
e431842668
Merge branch '2.7.x'
2022-03-25 14:56:49 +01:00
45f393b76b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30437
2022-03-25 14:56:01 +01:00
c003d5b533
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30436
2022-03-25 14:55:31 +01:00
0ff8119a1b
Sort entries in additional-spring-configuration metadata alphabetically
...
Closes gh-30434
2022-03-25 14:54:39 +01:00
3de024594f
Merge branch '2.7.x'
2022-03-25 12:06:16 +00:00
64888b0deb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30433
2022-03-25 12:03:24 +00:00
038428cb1a
Merge branch '2.7.x'
2022-03-23 15:29:23 +00:00
b911530c31
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30393
2022-03-23 15:29:09 +00:00
9c128f1acc
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30392
2022-03-23 15:28:56 +00:00
73d9e0e0ed
Fix equals when adapt removes trailing characters from element
...
Closes gh-30317
2022-03-23 14:55:00 +00:00
af15a18e02
Upgrade to Tomcat 10.0.18
...
Closes gh-30320
2022-03-18 17:06:51 +01:00
dd812a3f76
Upgrade to Groovy 4.0.1
...
Closes gh-30279
2022-03-18 12:38:41 +00:00
3d011fc2e6
Upgrade to Tomcat 9.0.60
...
Closes gh-30313
2022-03-18 09:49:28 +01:00
625ccc7c11
Merge branch '2.7.x'
2022-03-17 12:38:09 +00:00
4b318a76fa
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30271
2022-03-17 12:37:41 +00:00
0facba1f88
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30270
2022-03-17 12:37:23 +00:00
f342cec5cd
Relocate ConnectorStartFailureAnalyzer to remove package tangle
...
Closes gh-30268
2022-03-17 11:48:49 +00:00
626cfff940
Merge branch '2.6.x' into 2.7.x
2022-03-16 18:17:27 +01:00
8e7f7d3c76
Merge branch '2.5.x' into 2.6.x
2022-03-16 18:17:17 +01:00
b97a3ae07a
Revert unnecessary suppress warnings
...
See https://github.com/spring-projects/spring-framework/issues/28079
2022-03-16 18:10:58 +01:00
9ccbfe52f8
Upgrade to Tomcat 9.0.60
...
Closes gh-30249
2022-03-16 14:45:30 +01:00
59f4004fa6
Upgrade to Tomcat 9.0.60
...
Closes gh-30230
2022-03-16 08:43:17 +01:00
6baa248228
Start building against Spring Framework 5.3.17 snapshots
...
See gh-30188
2022-03-12 12:01:44 +01:00
71e6a836a6
Start building against Spring Framework 5.3.17 snapshots
...
See gh-30177
2022-03-12 11:50:03 +01:00
2620710480
Start building against Spring Framework 5.3.17 snapshots
...
See gh-30170
2022-03-11 21:22:48 +01:00
abcc246a38
Polish
2022-03-09 15:22:24 +00:00
e9d2ec507e
Merge branch '2.7.x'
2022-03-09 15:17:25 +00:00
f5ca568014
Remove versions less than 17 from JavaVersion enum
...
Closes gh-29503
2022-03-09 15:16:59 +00:00
a031c0c659
Merge branch '2.7.x'
2022-03-09 14:28:44 +00:00
881f2788ae
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30133
2022-03-09 14:28:31 +00:00
b1be6ac271
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30132
2022-03-09 14:28:01 +00:00
314acd3407
Add EIGHTEEN to JavaVersion
...
Closes gh-29524
2022-03-09 14:26:19 +00:00
20d21d4e58
Set up CI with JDK 18
...
Closes gh-30104
2022-03-09 12:28:34 +00:00
cc3021d2df
Start building against Spring Framework 6.0.0-M3 snapshots
...
See gh-29957
2022-03-08 12:49:37 +01:00
6f8ce3deb5
Avoid use of instance supplier for core infrastructure bean
...
Closes gh-30021
2022-03-07 21:09:41 +01:00
a1b1377733
Merge branch '2.7.x'
2022-03-07 13:23:06 +01:00
50d766020c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30084
2022-03-07 13:22:53 +01:00
564555347f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30083
2022-03-07 13:22:34 +01:00
be38311c5d
Disable incompatible tests on Linux AArch64
...
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
@DisableOnOs annotation. This new annotation supports the architecture
and is repeatable
Closes gh-30082
2022-03-07 13:22:17 +01:00
5ee3fdab77
Polish "Allow @DefaultValue to be used on record components"
...
See gh-29010
2022-03-04 14:52:20 +00:00
976ed90cd7
Allow @DefaultValue to be used on record components
...
See gh-29010
2022-03-04 12:12:08 +00:00
bfe9dede5b
Merge branch '2.7.x'
2022-03-02 20:30:30 +00:00
936998647e
Work around Gradle changing line endings during property expansion
...
There's a known issue [1] where property expansion changes the input
files line endings to the operating system's default. This causes
problems for us on Windows as the line endings become \r\n which
breaks our formatting checks.
This commit tunes the checkFormatMain task to exclude the generated
source files from checking. In their place, the original templates
are added. This ensures that the inputs are correctly formatted and,
therefore, that the output should be too (other than the line endings
on Windows).
Closes gh-30039
[1] https://github.com/gradle/gradle/issues/1151
2022-03-02 20:26:15 +00:00
525d5fd6e5
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29994
2022-02-24 15:12:36 +01:00
0941cfd5fe
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29993
2022-02-24 15:12:26 +01:00
b60b5feefe
Add explicit dependency on inject-api
...
This commit clarifies the build as a test needs inject-api and it works
only by side effect as another library has repackaged this API.
Closes gh-29990
2022-02-24 15:12:09 +01:00
5454e2e26a
Merge branch '2.7.x'
2022-02-23 23:02:59 -08:00
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
adfaa8f778
Merge branch '2.6.x' into 2.7.x
2022-02-23 21:44:37 -08:00
9411fc264d
Merge branch '2.5.x' into 2.6.x
2022-02-23 21:44:08 -08:00
57009d5623
Polish
2022-02-23 21:43:42 -08:00
a7c7a8ef2f
Merge branch '2.7.x' into main
2022-02-23 15:30:51 -08:00
729c6993e1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29981
2022-02-23 15:29:36 -08:00
acd1ba0eca
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29980
2022-02-23 15:28:17 -08:00
67b13ee4c7
Document that placeholders in @DefaultValue annotations are not resolved
...
Closes gh-23164
2022-02-23 15:27:43 -08:00
b64a6e6229
Merge branch '2.7.x' into main
2022-02-22 14:42:52 -06:00
c1fec6967e
Support constructor injection for FailureAnalyzers
...
This commit adds support for instantiating FailureAnalyzer
implementations with BeanFactory and/or an Environment constructor
arguments and deprecates support for setter injection of these values
using BeanFactoryAware and EnvironmentAware.
Closes gh-29811
2022-02-22 14:24:59 -06:00
132bf686f8
Merge branch '2.7.x'
2022-02-22 20:13:28 +00:00
2d9177dd9d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29955
2022-02-22 20:11:47 +00:00
3614c8d1f8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29954
2022-02-22 20:08:31 +00:00
1e8d29f7aa
Configure Kotlin compilation JVM target by convention
...
Closes gh-29952
2022-02-22 18:11:51 +00:00
1940f7a5d9
Merge branch '2.7.x'
2022-02-21 14:04:54 +00:00
6493c7c561
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29922
2022-02-21 14:01:58 +00:00
fcd52c02a7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29921
2022-02-21 14:01:47 +00:00
55f68989d8
Remove redundant action to make plugins dat file reproducible
...
Closes gh-29917
2022-02-21 14:01:04 +00:00
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
d7b229d3c7
Rename AutoConfigurationLoader to ImportCandidates
...
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports
See gh-29872
2022-02-21 10:34:38 +01:00
d59b89cd82
Merge branch '2.7.x'
2022-02-21 09:25:57 +01:00
c5307a8bfe
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29916
2022-02-21 09:25:21 +01:00
c52f6f09ad
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29915
2022-02-21 09:25:08 +01:00
92cd51e6b0
Polish "Clarify log message with a profile containing a comma"
...
See gh-29896
2022-02-21 09:00:27 +01:00
c8466a14e9
Clarify log message with a profile containing a comma
...
See gh-29896
2022-02-21 08:28:10 +01:00
8209980ca0
Merge branch '2.7.x'
2022-02-18 19:02:54 +00:00
027093d852
Use a templated source file for SpringBootVersion
...
Closes gh-29670
2022-02-18 18:08:09 +00:00
78dde15da4
Merge branch '2.7.x'
2022-02-18 13:56:11 +01:00
940558c2a6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29906
2022-02-18 13:55:53 +01:00
16c47595e7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29905
2022-02-18 13:55:27 +01:00
00114f9d61
Deregister failed contexts from SpringApplicationShutdownHook
...
Prior to this change, SpringApplication would register contexts to
SpringApplicationShutdownHook and only deregister them when they're
properly closed. A failed refresh attempt does not deregister the
context from the shutdown hook.
When a test suite runs lots of tests failing because of failed contexts,
this can build up and consume lots of resources.
This commit fixes this leak and deregisters failed contexts.
Fixes gh-29874
2022-02-18 13:54:14 +01:00
2145396841
Merge branch '2.7.x'
2022-02-18 10:18:17 +00:00
fc8f55fbf4
Upgrade to OkHTTP 4.9.3
...
Closes gh-18506
2022-02-18 10:05:54 +00:00
ff4b92a3ba
Update copyright year of changed files
2022-02-16 20:44:54 -08:00
37263ea7dd
Merge branch '2.7.x'
2022-02-16 20:43:21 -08:00
c0ffb35668
Update copyright year of changed files
2022-02-16 20:43:10 -08:00
bf1ed5f2f8
Update copyright header on changed files
2022-02-16 14:24:22 -08:00
44b88cc88c
Allow @ConstructorBinding to be optional
...
This commit makes @ConstructorBinding optional for a type
that has a single parameterized constructor. An @Autowired annotation
on any of the constructors indicates that the type should not be constructor
bound.
Since @ConstructorBinding is now deduced for a single parameterized constructor,
the annotation is no longer needed at the type level.
Closes gh-23216
2022-02-16 13:47:26 -08:00
2305b583f1
Merge branch '2.7.x'
2022-02-16 11:56:03 +00:00
18e49b0269
Fix H2 R2DBC URL on Windows
...
Closes gh-29875
2022-02-16 11:55:11 +00:00
7e1f17e5a6
Merge branch '2.7.x'
2022-02-15 16:21:08 +01:00
197203968a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29823
2022-02-15 16:20:45 +01:00
f59e442978
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29822
2022-02-15 16:19:59 +01:00
f3af035941
Remove usage of SocketUtils in tests
...
Closes gh-29821
2022-02-15 16:17:21 +01:00
527fca8bdb
Revert change in toString
...
This commit reverts the change in test as it only applies to the
snapshot of Spring Framework.
2022-02-13 18:44:04 +01:00
686591bf24
Merge branch '2.7.x'
2022-02-13 18:16:03 +01:00
00279b6928
Merge branch '2.6.x' into 2.7.x
2022-02-13 18:15:57 +01:00
bd6cb5c915
Merge branch '2.5.x' into 2.6.x
2022-02-13 18:15:48 +01:00
1f01345057
Fix assertion due to toString change in Spring Framework
2022-02-13 18:01:00 +01:00
79e5d3a2d0
Merge branch '2.7.x' into main
2022-02-11 14:45:00 -06:00
f80490bafb
Precompute Spring Boot version at build time
...
Closes gh-29670
2022-02-11 14:44:28 -06:00
a41316d386
Merge branch '2.7.x'
2022-02-11 14:15:13 +00:00
197112e1bc
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29751
2022-02-11 14:14:59 +00:00
4b33ea733e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29750
2022-02-11 14:14:43 +00:00
387795d4db
Remove trailing space from media type for ots mapping
...
The regular expression in the new test is intended to match the
documented [1] ABNF for a media type:
type-name = reg-name
subtype-name = reg-name
reg-name = 1*127reg-name-chars
reg-name-chars = ALPHA / DIGIT / "!" /
"#" / "$" / "&" / "." /
"+" / "-" / "^" / "_"
Closes gh-29746
[1] https://datatracker.ietf.org/doc/html/rfc4288#section-4.2
2022-02-11 14:09:53 +00:00
3b4832445b
Merge branch '2.7.x'
2022-02-05 14:02:00 +01:00
098a57affb
Upgrade to R2DBC Borca-RELEASE
...
See gh-28524
2022-02-05 13:37:20 +01:00
b22e3d51dc
Merge branch '2.7.x'
2022-02-04 10:10:29 +01:00
e3d0f1feee
Adjust IDENTITY in DDLs for H2 2.x compatibility
...
See gh-29200
2022-02-04 09:57:59 +01:00
a282f912e6
Organize imports
...
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
501d174db0
Merge branch '2.7.x'
2022-02-02 10:38:46 -08:00
ce08b519b1
Merge branch '2.6.x' into 2.7.x
2022-02-02 10:37:55 -08:00
50e0e28155
Merge branch '2.5.x' into 2.6.x
2022-02-02 10:37:32 -08:00
2b40ce09d8
Update copyright year of changed files
2022-02-02 10:35:40 -08:00
f88b502f7e
Remove support for image banners
...
Closes gh-28883
2022-02-02 14:40:24 +00:00
41fb9cf562
Merge branch '2.7.x'
2022-02-01 11:15:49 +01:00
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01:00
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
b49418aaaf
Enforce use of BDDMockito
...
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule
See gh-29178
2022-02-01 09:37:15 +01:00
42df01f193
Merge branch '2.7.x'
2022-01-29 15:44:55 +01:00
0c0ec64ed4
Polish "Use existing constant rather than "spring.beaninfo.ignore""
...
See gh-29592
2022-01-29 15:39:43 +01:00
1a558292a8
Use existing constant rather than "spring.beaninfo.ignore"
...
See gh-29592
2022-01-29 15:39:28 +01:00
c820ad01a1
Fix checkstyle error
2022-01-25 14:52:30 -08:00
e19fa140e7
Fix merge conflict mistake
2022-01-25 13:34:10 -08:00
8ab87ace24
Merge branch '2.7.x'
2022-01-25 13:18:33 -08:00
bb024211f6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29565
2022-01-25 13:17:22 -08:00
df9cf6b726
Make ErrorPageSecurityFilter compatible with Servlet 3.1
...
Ensure that all default methods are implemented so that the
filter is compatible with Servlet 3.1 environments.
Fixes gh-29558
2022-01-25 13:15:59 -08:00
03da915f56
Merge branch '2.7.x'
2022-01-25 09:22:49 +01:00
24c5f4b7ea
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29557
2022-01-25 09:22:19 +01:00
1204c1aa32
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29556
2022-01-25 09:21:49 +01:00
f1bbce1aac
Do not modify AliasChecks list from Jetty WebAppContext
...
Closes gh-29555
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-01-25 08:58:42 +01:00
7b35fabf07
Upgrade to Derby 10.15.2.0
...
Closes gh-29509
2022-01-20 17:37:01 +00:00
35b5b5672d
Merge branch '2.7.x'
2022-01-20 12:37:16 +00:00
2c049f2b40
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29501
2022-01-20 12:36:49 +00:00
3460c24a16
Ignore context path when calling privilege evaluator
...
Previously, the error page security filter passed the request's URI
to the privilege evaluator. This was incorrect in applications with
a custom context path as the privilege evaluator must be passed a
path that does not include the context path and the request URI
includes the context path.
This commit updates the filter to use UrlPathHelper's
pathWithinApplication instead. The path within the application does
not include the context path. In addition, pathWithinAppliation
also correctly handles applications configured with a servlet
mapping other than the default of /.
Closes gh-29299
Co-Authored-By: Andy Wilkinson <wilkinsona@vmware.com>
2022-01-20 12:36:18 +00:00
de3b9a4910
Remove code deprecated for removal in 2.x
...
Closes gh-29482
2022-01-19 17:25:14 +00:00
0d2e3bc4c9
Merge branch '2.7.x'
2022-01-19 12:24:47 +01:00
f510805f00
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29479
2022-01-19 12:24:32 +01:00
d92939e773
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29478
2022-01-19 12:24:15 +01:00
4eb458f7d8
Prevent early resolution of factory beans
...
This commit updates DatabaseInitializationDependencyConfigurer so that
it does not inject the Environment anymore. Doing so in such a low-level
callback can lead to early resolution of factory beans. Rather, this
commit uses the EnvironmentAware callback that short-circuit dependency
resolution.
Closes gh-29475
2022-01-19 11:49:56 +01:00
4d03f89a55
Harmonize dependency upgrades with Spring Boot 2.7.0-M1
...
Closes gh-29476
2022-01-19 10:39:18 +01:00
e4b398769f
Merge branch '2.7.x'
2022-01-18 16:16:59 -08:00
a77411ebd8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29460
2022-01-18 16:16:18 -08:00
3b4409305a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29459
2022-01-18 16:15:20 -08:00
3d46b06e8d
Fix config data placeholder resolution active document logic
...
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.
The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.
Fixes gh-29386
2022-01-18 16:14:52 -08:00
d04ece044a
Merge branch '2.7.x'
2022-01-18 20:35:20 +00:00
654d142c95
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29455
2022-01-18 20:35:06 +00:00
4ee260aa8c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29454
2022-01-18 20:34:51 +00:00
1c6471ef60
Register AprLifecycleListener with Server not Context
...
Fixes gh-28814
2022-01-18 20:34:08 +00:00
3146465d25
Merge branch '2.7.x'
2022-01-14 22:56:52 -08:00
a2e473ec31
Merge branch '2.6.x' into 2.7.x
2022-01-14 22:56:43 -08:00
6afd9b665d
Merge branch '2.5.x' into 2.6.x
2022-01-14 22:56:30 -08:00
bccc9c1861
Refine ConfigurationPropertySources attach logic
...
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.
See gh-29409
2022-01-14 22:55:26 -08:00
d0e7ab3b70
Merge branch '2.7.x'
...
Closes gh-29412
2022-01-14 20:33:42 -08:00
e4e16f81ec
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29411
2022-01-14 20:33:19 -08:00
28cf6f5c59
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29410
2022-01-14 20:33:05 -08:00
79d9549805
Fix ConfigurationPropertySources attach logic
...
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.
Fixes gh-29409
2022-01-14 20:32:34 -08:00
0367e13d90
Merge branch '2.7.x'
2022-01-14 17:38:49 -08:00
9c481952d8
Remove deprecated convertEnvironment method
2022-01-14 17:38:23 -08:00
13f257a706
Merge branch '2.7.x'
2022-01-12 15:44:47 -08:00
8147eb6d6d
Merge branch '2.6.x' into 2.7.x
2022-01-12 15:43:44 -08:00
e7fe371927
Merge branch '2.5.x' into 2.6.x
2022-01-12 15:43:11 -08:00
27ad0804f5
Update copyright year of changed files
2022-01-12 15:42:25 -08:00
3d6840e715
Merge branch '2.7.x'
...
Closes gh-29376
2022-01-12 15:32:51 -08:00
fee45e056a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29375
2022-01-12 15:32:34 -08:00
91d2b1b988
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29374
2022-01-12 15:32:00 -08:00
eb6b48fff0
Use side-effect free environment with tests rather than converting
...
Refine the logic introduced in 64270eca
2022-01-12 14:21:52 -08:00
0af6761993
Merge branch '2.7.x'
2022-01-10 10:29:58 +01:00
270e162479
Stop aliasing MariaDB to MySQL
...
Closes gh-28728
2022-01-10 10:29:49 +01:00
11e604af41
Merge branch '2.7.x'
2022-01-07 14:43:19 +01:00
9821cdfd8b
Remove deprecated code
...
Closes gh-29290
2022-01-07 14:42:14 +01:00
c2e86096cd
Reinstate support for jOOQ as it now supports Jakarta EE 9
...
Closes gh-29271
2022-01-05 15:46:54 +00:00
06398eabed
Merge branch '2.7.x'
2022-01-04 12:26:24 -08:00
b25e92f3e2
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:24:34 -08:00
99a683dffb
Merge branch '2.5.x' into 2.6.x
2022-01-04 12:24:02 -08:00
9a6f35cd8e
Update copyright year of changed files
2022-01-04 12:23:53 -08:00
760dcffd8b
Merge branch '2.7.x'
2022-01-04 12:22:54 -08:00
f09bde2b60
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:20:31 -08:00
81266ca806
Merge branch '2.5.x' into 2.6.x
2022-01-04 12:17:35 -08:00
0fcdab3936
Update copyright year of changed files
2022-01-04 12:17:10 -08:00
b214841e2c
Merge branch '2.7.x'
2022-01-04 16:14:28 +01:00
605ec2fb0e
Polish "Add vendor version to JavaInfo"
...
See gh-29090
2022-01-04 16:10:02 +01:00
c6e6d109ad
Add vendor version to JavaInfo
...
See gh-29090
2022-01-04 16:09:45 +01:00
abb622023d
Merge branch '2.7.x'
2022-01-04 14:23:48 +01:00
d24720d958
Polish "Expose OS information as an InfoContributor"
...
See gh-28907
2022-01-04 14:08:24 +01:00
c700f686c6
Expose OS information as an InfoContributor
...
See gh-28907
2022-01-04 13:58:39 +01:00
938d58f32c
Merge branch '2.7.x'
2021-12-20 14:00:47 -06:00
29ad84714a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29144
2021-12-20 14:00:24 -06:00
b3a304fbe7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29143
2021-12-20 14:00:06 -06:00
e4b0575a12
Do not consider bridge methods when binding java bean properties
...
Fixes gh-28917
2021-12-20 13:57:36 -06:00
d271e76b48
Merge branch '2.7.x'
2021-12-20 18:08:10 +01:00
83d732823d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29136
2021-12-20 18:08:00 +01:00
653fdbd0a4
Configure comment prefixes
...
Closes gh-29095
2021-12-20 17:47:50 +01:00
48a6470ddb
Merge branch '2.7.x' into main
2021-12-17 17:51:48 -08:00
764531c326
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29108
2021-12-17 17:51:29 -08:00
d9d161cd6b
Allow previously authorized users to access the error page
...
Prior to this commit, the `ErrorPageSecurityFilter` verified if
access to the error page was allowed by invoking the
`WebInvocationPrivilegeEvaluator` with the Authentication from the
`SecurityContextHolder`.
This meant that access to the error page was denied for a `null` Authentication
or `AnonymousAuthenticationToken` in cases where the error page required
authenticated access. This prevented authorized users from accessing the
error page in case the Authentication wasn't retrievable for the error dispatch,
which is the case for `@Transient` authentication or stateless session policy.
This commit updates the `ErrorPageSecurityFilter` to check access to the error page
only if the error is an authn or authz error in cases where an authentication object
is not found in the SecurityContextHolder. This makes the error response consistent
when bad credentials or no credentials are used while also allowing access to previously
authorized users.
Fixes gh-28953
2021-12-17 16:58:58 -08:00
c975fbc286
Merge branch '2.7.x'
2021-12-17 16:38:15 +01:00
64dd1f86c0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29104
2021-12-17 16:38:07 +01:00
c077ebecf7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29103
2021-12-17 16:37:53 +01:00
2fec06ac7e
Find annotation without initializing factory beans
...
Closes gh-28977
2021-12-17 16:08:30 +01:00
1015df088d
Merge branch '2.6.x' into 2.7.x
2021-12-16 13:55:55 -08:00
587d6fa309
Polish
2021-12-16 13:55:42 -08:00
003fb229fd
Merge branch '2.7.x'
2021-12-16 13:07:22 -08:00
f3bcbca841
Update copyright year of changed files
2021-12-16 13:05:17 -08:00
b4cdd37e63
Merge branch '2.7.x'
2021-12-16 12:24:25 -06:00
4cad4851da
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29088
2021-12-16 12:24:12 -06:00
92b096abbf
Fix message interpolation when code is used as default message
...
When `setUseCodeAsDefaultMessage(true)` was set on a message source,
attempting to interpolate the default message returned from the message
source would result in the code being unusable by upstream message
resolvers.
Fixes gh-28930
2021-12-16 12:20:37 -06:00
cd69781457
Merge branch '2.7.x'
2021-12-14 15:32:22 +01:00
9ca1cffab7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29016
2021-12-14 15:32:13 +01:00
ba60e3d358
Merge branch '2.5.x'
...
Closes gh-29002
2021-12-14 15:31:45 +01:00
c83ab9bbc5
Merge branch '2.7.x'
2021-12-09 15:51:29 +01:00
89635eafa3
Update copyright year of changed files
...
See gh-28862
2021-12-09 15:48:47 +01:00
a5c56043b9
Simplify AssertJ usage
...
See gh-28862
2021-12-09 15:39:02 +01:00
ad754abba3
Make ErrorPageSecurityFilter compatible with Servlet 3.1
...
See gh-28902
2021-12-09 12:36:35 +00:00
33953823fc
Replace usage of deprecated Spring Framework methods
...
See gh-28642
2021-12-06 16:12:34 -06:00
fe7b13ec46
Upgrade to Spring Framework 6 and Jakarta EE 9
...
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872
See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
4a8904aaa9
Drop support for jOOQ until its dependencies are Jakarta EE 9 compatible
...
Closes gh-28821
2021-11-30 15:55:48 +00:00
8bf2ffd93c
Drop support for Jersey until jersey-spring6 is available
...
Closes gh-28808
2021-11-30 15:39:39 +00:00
ef02cc9bff
Remove support for Atomikos
...
Closes gh-28589
2021-11-30 15:38:01 +00:00
900085628a
Raise the minimum supported version of Java to 17
...
Closes gh-28101
2021-11-30 15:37:40 +00:00
99f33ede14
Remove SecurityManager support
...
Closes gh-28213
2021-11-30 15:37:15 +00:00
46a8673bf8
Merge branch '2.5.x'
...
Closes gh-28839
2021-11-29 09:44:31 +01:00
1876b4bcd7
Update copyright year of changed files
...
See gh-28809
2021-11-29 09:43:44 +01:00
f3c93d30a8
Fix reference to matching-strategy property
...
See gh-28809
2021-11-29 09:39:40 +01:00
c7921468fc
Polish
...
See gh-28836
2021-11-29 09:38:07 +01:00
beb68671bb
Update copyright year of changed files
2021-11-24 10:23:32 -08:00
e6b5be900a
Make ErrorPageSecurityFilter Servlet 3.1 compatible
...
Restore Servlet 3.1 compatibly by implementing `Filter` rather
than extending the 4.0 `HttpFilter` type.
Fixes gh-28790
2021-11-24 09:59:27 -08:00
f621937d3b
Skip error page security filter for non-error dispatch type
...
Update `ErrorPageSecurityFilter` to defensively check that the
`DispatcherType` is `ERROR`. Although this check isn't necessary
for regular applications, it is needed if MockMvc is being used.
Fixes gh-28759
2021-11-24 09:55:59 -08:00
dd1d1482dc
Deny unauthorized access to the error page
...
Fixes gh-26356
Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-11-18 15:41:38 -08:00
6b79d2860f
Merge branch '2.5.x' into main
...
Closes gh-28724
2021-11-17 16:41:23 -08:00
64270eca51
Convert environment used by SpringBootTestContextLoader
...
This commit aligns `SpringBootTest`s to also use `ApplicationEnvironment`
instead of `StandardEnvironment`. This prevents the side-effect of active
profiles from `@ActiveProfiles` from being added to the environment when
doGetActiveProfiles is called. In this case, calling `addActiveProfiles()`
in the environment post processor would result in `@ActiveProfiles` being
added to the environment first, resulting in the wrong order.
The additional call to `setActiveProfiles()` is also not necessary when using
ApplicationEnvironment because that call was put in place to prevent the side-effect
which `ApplicationEnvironment` does not have.
Fixes gh-28530
2021-11-17 16:40:53 -08:00
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
5d8dce70dc
Polish
...
See gh-28494
2021-11-01 08:58:40 +01:00
e54b876536
Merge branch '2.5.x'
...
Closes gh-28487
2021-10-29 15:50:01 +01:00
5e42f27b36
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28486
2021-10-29 15:49:49 +01:00
e4e1958b65
Make Logback fall back to JVM's default charset
...
The charset "default" is an alias for US-ASCII, not the JVM's default
charset. This commit updates the built-in Logback configuration to
use Charset.defaultCharset().name() in place of "default" in the
Java-based configuration. In the XML-based configuration where
Charset.defaultCharset().name() cannot be called, we emulate its
behaviour [1] by using the file.encoding system property, falling back
to UTF-8 when it's not set.
Fixes gh-27230
[1] 19be6113dd/jdk/src/share/classes/java/nio/charset/Charset.java (L604-L617)
2021-10-29 14:40:05 +01:00
ea8a8ecd0e
Merge branch '2.5.x'
...
Closes gh-28467
2021-10-28 11:53:34 +02:00
ce38d592f9
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28466
2021-10-28 11:53:19 +02:00
a05b2207f8
Fix description of "logging.logback.rollingpolicy.max-history"
...
See gh-28448
2021-10-28 11:45:42 +02:00
e25f216eab
Merge branch '2.5.x'
...
Closes gh-28425
2021-10-21 11:28:33 -07:00
daf36dff55
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28424
2021-10-21 11:27:29 -07:00
2f6651c3cb
Don't use markdown syntax in javadoc or error messages
...
Closes gh-28408
2021-10-21 11:24:54 -07:00
ec79f14639
Drop AbstractJettyServletWebServerFactoryTests
...
Drop `AbstractJettyServletWebServerFactoryTests` and merge the existing
code into `JettyServletWebServerFactoryTests`.
2021-10-20 22:58:46 -07:00
cf9156e497
Add SameSite cookie support for servlet web servers
...
Update Tomcat, Jetty and Undertow `ServletWebServerFactory`
implementations so that they can write SameSite cookie attributes.
The session cookie will be customized whenever the
`server.servlet.session.cookie.same-site` property is set.
Other cookies can be customized with the new `CookieSameSiteSupplier`
interface which can be registered using `@Bean` methods.
Closes gh-20971
Co-authored-by Andy Wilkinson <wilkinsona@vmware.com>
2021-10-20 22:58:31 -07:00
b72ff25220
Relocate and unify reactive cookie properties
...
Relocate the recently introduced `spring.webflux.session` properties
to `server.reactive.session` and create a unified `Cookie` properties
class.
Reactive session properties now mirror the existing
`server.servlet.session` properties and better reflect the fact that
they are related to the server and not just for WebFlux.
See gh-26714
2021-10-20 22:09:33 -07:00
3c71637fa2
Polish 'Add more session properties for reactive web servers'
...
See gh-26714
2021-10-20 22:09:30 -07:00
6c43914652
Merge branch '2.5.x'
...
Closes gh-28383
2021-10-19 17:43:40 +01:00
76272ffb62
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28382
2021-10-19 17:43:30 +01:00
54ce51e43c
Polish "Fix typos in EnvironmentPostProcessor javadoc"
...
See gh-28376
2021-10-19 17:43:16 +01:00
ded396b728
Fix typos in EnvironmentPostProcessor javadoc
...
See gh-28376
2021-10-19 17:41:46 +01:00
89b40e1e00
Add support for Log4j2's composite configuration
...
Closes gh-27110
2021-10-19 10:01:30 +01:00
04123e0a0e
Merge branch '2.5.x'
...
Closes gh-28377
2021-10-18 21:47:07 -07:00
19d3007806
Polish
2021-10-18 21:44:56 -07:00
31d88c3d3c
Improve failure analysis action when circular references are allowed
...
Closes gh-27735
2021-10-18 16:02:13 +01:00
2034ad4827
Merge branch '2.5.x'
2021-10-13 18:48:18 -07:00
02b577390f
Merge branch '2.4.x' into 2.5.x
2021-10-13 18:47:51 -07:00
0561992c2a
Update copyright year of changed files
2021-10-13 18:45:38 -07:00
cc8d7fc605
Polish contribution
...
See gh-28239
2021-10-13 09:10:11 +02:00
1770f065a5
Polish
...
See gh-28239
2021-10-13 09:07:33 +02:00
1a505964ee
Merge branch '2.5.x'
...
Closes gh-28207
2021-10-06 10:03:24 +01:00
1931104d13
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28206
2021-10-06 09:57:19 +01:00
9c9fbf400e
Upgrade to Spring Java Format 0.0.29
...
Closes gh-28205
2021-10-06 09:52:45 +01:00
c5088a3bd3
Avoid explicit initialization of Atomics with their default values
...
See gh-28162
2021-10-05 15:37:00 +02:00
5d17257a52
Polish "Add Java InfoContributor"
...
See gh-28136
2021-10-05 15:11:58 +02:00
fb9f1eba41
Merge branch '2.5.x' into main
...
Closes gh-28172
2021-10-01 15:55:06 -07:00
3249d05464
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28171
2021-10-01 15:54:49 -07:00
f94caed7e9
Update ConstructorBinding javadoc with usage information
...
See gh-28168
2021-10-01 15:53:43 -07:00
2d2cbff504
Avoid NoSuchMethodError from UCP's PoolDataSource.getPassword()
...
While still present and marked as deprecated, the getPassword()
method on UCP's PoolDataSource has been implemented to throw a
NoSuchMethodError making it useless for our purposes.
This commit updates DataSourceBuilder to avoid using the getter. This
means that a password must now be provided when trying to derive a
new DataSource from an existing PoolDataSource.
Closes gh-28127
2021-09-24 10:10:15 +01:00
5e426394db
Add exception and analyzer for mutually exclusive config props
...
Add `MutuallyExclusiveConfigurationPropertiesException` and a related
failure analyzer so that a nice message can be displayed if more than
one mutually exclusive property is defined.
Closes gh-28121
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-09-23 16:18:03 -07:00
528ced4f0d
Rename 'running' to 'ready' for ApplicationStartup
...
Rename 'spring.boot.application.running' to
'spring.boot.application.ready' to better align with `ReadinessState`.
Closes gh-28080
2021-09-23 12:54:22 -07:00
4fa61cbc60
Merge branch '2.5.x'
2021-09-22 18:37:11 +01:00
2ba593328f
Order detector for AbstractDataSourceInitializers
...
Previously, the detector for AbstractDataSourceInitializers used the
default detector order. This resulted in the initializers detected
initializers running before Flyway. Constrastingly, the detector for
DataSourceScriptDatabaseInitializers uses a custom order so its
detected initializers would run after Flyway.
This commit aligns the order of the detector for
AbstractDataSourceInitializers with the order of the detector for
DataSourceScriptDatabaseInitializers. This ensures that script-based
initialization runs in the same order with respect to Flyway,
irrespective of which initializer implementation is driving it.
Fixes gh-28079
2021-09-22 18:30:44 +01:00
98a0e07dd5
Polish "Add startup time metrics"
...
See gh-27878
2021-09-21 14:45:00 -07:00
55a1ec72cc
Update copyright year of changed files
2021-09-21 11:25:50 -07:00
5ba69634c9
Merge branch '2.4.x' into 2.5.x
2021-09-21 11:17:55 -07:00
dfd36673f7
Update copyright year of changed files
2021-09-21 11:17:19 -07:00
e0465f7357
Use RootBeanDefinition consistently
...
Closes gh-28077
2021-09-21 16:36:45 +02:00
d68b6bb2f1
Polish "Add testing for AbstractFailureAnalyzer.findCause"
...
See gh-27862
2021-09-21 10:05:15 +02:00
a2eed676a2
Add testing for AbstractFailureAnalyzer.findCause
...
See gh-27862
2021-09-21 09:52:10 +02:00
cf0fcafd13
Polish
...
See gh-27940
2021-09-21 08:08:29 +02:00
b69ef0c881
Upgrade to Oracle Database 21.3.0.0
...
Closes gh-28054
2021-09-20 17:44:57 +01:00
c62a6819fe
Polish "Add startup time metrics"
...
See gh-27878
2021-09-16 13:33:08 +02:00
2e67963bfe
Add startup time metrics
...
See gh-27878
2021-09-16 13:19:20 +02:00
358ab2a8d5
Merge branch '2.5.x'
...
Closes gh-28034
2021-09-16 10:51:14 +01:00
a4f1d32203
Register application shutdown hook lazily
...
Previously, SpringApplicationShutdownHook would always register a
shutdown hook, even if SpringApplication was configured not to
use a shutdown hook, such as in a war deployment. This could
result in a memory leak when the war was undeployed. The shutdown
hook registered by SpringApplicationShutdownHook would remain
registered, pinning the web application's class loader in memory.
This commit updates SpringApplicationShutdownHook so that it
registers a shutdown hook with the JVM lazily, upon registeration
of the first application context.
Fixes gh-27987
2021-09-16 10:38:29 +01:00
69e793ab37
Merge branch '2.5.x'
...
Closes gh-28033
2021-09-16 09:56:26 +01:00
afb81f14ea
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28032
2021-09-16 09:55:45 +01:00
1900a11f8a
Fix Undertow's resource loading when filename contains reserved chars
...
Fixes gh-9283
2021-09-16 09:55:26 +01:00
8c819c94d6
Upgrade to Tomcat 9.0.53
...
Closes gh-27964
2021-09-13 11:04:57 +02:00
2004c062df
Upgrade to Tomcat 9.0.53
...
Closes gh-27963
2021-09-13 11:04:02 +02:00
ab81e3c05c
Upgrade to Tomcat 9.0.53
...
Closes gh-27961
2021-09-13 10:28:42 +02:00
e1afc91ae2
Polish javadoc comments
...
See gh-27925
2021-09-10 07:53:49 +02:00
242d730f51
Deprecate DataSourceInitializationMode
...
See gh-27926
2021-09-10 07:51:32 +02:00
e10ebb17e0
Polish "Fix tests on non English systems"
...
See gh-27887
2021-09-08 08:07:09 +02:00
32e51966dd
Fix tests on non English systems
...
See gh-27887
2021-09-08 07:59:35 +02:00
b4b71ec015
Add bind method to ConfigurationProperties bean definition
...
This commit reworks the configuration properties registrar to use
RootBeanDefinition and a standard attribute rather than relying on
a package private sub-class. This allows other components to inspect
the metadata if necessary.
Closes gh-27821
2021-09-06 10:28:03 +02:00
542e6ab0d3
Merge branch '2.5.x'
...
Closes gh-27879
2021-09-06 08:33:14 +02:00
d6cc1f6d7d
Polish "Use more precise variables to detect Azure App Service"
...
See gh-27819
2021-09-06 08:28:58 +02:00
69b23470c7
Use more precise variables to detect Azure App Service
...
See gh-27819
2021-09-06 08:12:22 +02:00
e25553e3c3
Merge branch '2.5.x'
...
Closes gh-27874
2021-09-05 17:02:43 +02:00
3dab5ff2c0
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27873
2021-09-05 17:02:17 +02:00
831e28b001
Fix typo in javadoc
...
See gh-27856
2021-09-05 17:01:31 +02:00
b01fa6a899
Merge branch '2.5.x'
...
Closes gh-27860
2021-09-02 11:17:06 -07:00
1215bbc10b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27859
2021-09-02 11:16:42 -07:00
61764389c2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-27858
2021-09-02 11:15:32 -07:00
44eb8c39d2
Align ApplicationTemp with Files.createTempDirectory
...
Update `ApplicationTemp` to align the way that it creates temp folders
with the way that `Files.createTempDirectory` works.
Closes gh-27857
2021-09-02 11:13:26 -07:00
253f98c3e7
Add pluggable abstraction for applying custom sanitization rules
...
Closes gh-27840
2021-08-30 21:31:15 -07:00
211532f08d
Exclude CustomNumberEditor and CustomBooleanEditor
...
Add `CustomNumberEditor` and `CustomBooleanEditor` to the editor
exclusions sine the regular `ConversionService` should be able to
handle them.
Closes gh-27829
2021-08-27 23:15:23 -07:00
8db82f02fc
Merge branch '2.5.x'
...
Closes gh-27831
2021-08-27 22:49:39 -07:00
15d0078eca
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27830
2021-08-27 22:40:56 -07:00
87dbda2339
Ensure TypeConverterConverter is thread safe
...
Update `TypeConverterConverter` do that a new `SimpleTypeConverter` is
obtained for each `convert` operation. Prior to this commit the same
`SimpleTypeConverter` could be accessed concurrently from multiple
threads which is not allowed.
Fixes gh-27829
2021-08-27 22:08:40 -07:00
e147cae84c
Fix typo in action for bean currently in creation failure analysis
...
See gh-27781
2021-08-23 13:36:59 +01:00
fd2fbcb3c6
Merge branch '2.5.x'
...
Closes gh-27758
2021-08-18 18:28:34 +01:00
6d8ba3e8b1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27757
2021-08-18 17:56:32 +01:00
ffbd28b60a
Polish "Polish access modifiers for test classes"
...
See gh-27736
2021-08-18 17:52:42 +01:00
8a425dedfd
Polish access modifiers for test classes
...
See gh-27736
2021-08-18 17:38:40 +01:00
01e741d703
Prohibit circular references by default
...
Closes gh-27652
2021-08-17 14:51:39 +01:00
d5e1edae9f
Use Pattern for Groovy closure checks
...
See gh-27661
2021-08-16 08:13:49 +02:00
9bfe3c8cff
Merge branch '2.5.x'
...
Closes gh-27639
2021-08-12 12:33:08 +01:00
aafa21686a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27638
2021-08-12 12:32:56 +01:00
3bed23d9dc
Replace PropertyMapper.CachingSupplier with use of SingletonSupplier
...
Closes gh-27635
2021-08-12 12:04:18 +01:00
57050fade4
Fix typo
2021-08-12 11:32:18 +02:00
49c86e6e1b
Allow health groups to be configured at an additional path
...
Closes gh-25471
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-08-11 19:25:25 -07:00
94c347c64d
Merge branch '2.5.x'
...
Closes gh-27619
2021-08-10 10:04:09 +02:00
1d29443e71
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27618
2021-08-10 10:04:01 +02:00
5b15c2191b
Fix typo in javadoc
...
See gh-27614
2021-08-10 09:59:30 +02:00
e86ba076ec
Merge branch '2.5.x'
...
Closes gh-27556
2021-08-04 08:56:02 +02:00
a9ea8d95f3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27555
2021-08-04 08:55:51 +02:00
46c47dcd29
Remove dead code in DefaultErrorAttributes
...
See gh-27538
2021-08-04 08:45:30 +02:00
621844abda
Polish "Use MessageSource to interpolate bean validation messages"
...
See gh-17530
2021-07-26 12:10:15 +01:00
bbb8367afb
Use MessageSource to interpolate bean validation messages
...
See gh-17530
2021-07-26 12:10:15 +01:00
a5656e0932
Make @ConstructorBinding implict for config prop records
...
Closes gh-27216
2021-07-24 10:03:37 +01:00
dd7dd58f41
Merge branch '2.5.x'
...
Closes gh-27471
2021-07-23 11:02:43 +01:00
589a22eb0d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27470
2021-07-23 11:02:24 +01:00
9e81fb3e38
Fix race condition in Jetty graceful shutdown tests
...
Some of the Jetty graceful shutdown tests were flaky due to the way
in which Jetty behaves when it is stopped.
Stopping the Jetty web server interrupts the thread that's handling
the active request. This initiates a race between the request-handling
thread which will decrement the number of active requests and the
main thread which expects an active request to cause the shutdown
result to be REQUESTS_ACTIVE. The test passes when the main thread
wins and fails as a request is active which it's checked. When the
request-handling thread wins the test fails as the count of active
requests has been deprecated before it is checked.
The blocking servlet that's used to stall a request and keep it
active needs to be updated to ignore the thread being interrupted
and continue waiting. This will ensure that a request remains active
until the main thread has checked the active request count and
determine the result of the shutdown.
Closes gh-27464
2021-07-23 10:30:17 +01:00
7e9ac39f0d
Update copyright year of changed files
2021-07-22 09:50:37 -07:00
20a6073913
Polish
2021-07-22 09:50:17 -07:00
c9361798be
Merge branch '2.5.x'
...
Closes gh-27455
2021-07-22 11:42:45 +01:00
18b4898977
Polish "Fix deriving DataSources from custom type"
...
See gh-27453
2021-07-22 11:41:54 +01:00
d0e2823c49
Fix deriving DataSources from custom type
...
Eliminate the unsupported datasource property exception thrown
when trying to derive a datasource from an unknown datasource type.
See gh-27453
2021-07-22 11:41:54 +01:00
37f690323f
Polish
...
Closes gh-27432
2021-07-21 11:55:38 +01:00
bb26b7bdf5
Polish
...
Closes gh-27431
2021-07-21 11:53:10 +01:00
734293d491
Polish
...
See gh-27418
2021-07-21 11:17:43 +01:00
91579158c3
Merge branch '2.5.x'
...
Closes gh-27425
2021-07-21 10:58:27 +01:00
29c83bfd76
Instantiate detectors with ClassLoader that discovered them
...
Fixes gh-27422
2021-07-21 10:57:30 +01:00
289ebef7da
Merge branch '2.5.x'
...
Closes gh-27420
2021-07-20 18:00:21 +01:00
a5e95ef4c8
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27419
2021-07-20 17:59:53 +01:00
b5587b053d
Use ClassLoader that will load Yaml to check if it's present
...
Fixes gh-27133
2021-07-20 17:59:40 +01:00
a05da3ae14
Merge branch '2.5.x'
...
Closes gh-27416
2021-07-20 15:14:44 +01:00
0ea3b9246a
Add Java 17 to JavaVersion enum
...
See gh-26769
2021-07-20 15:12:50 +01:00
b5ef5a2d90
Merge branch '2.5.x'
...
Closes gh-27408
2021-07-19 20:20:19 +01:00
9d2cb162e6
Configure initializer dependencies grouped by detector
...
Previously, database initializers were detected and were configured
with dependencies based on their detection order. For example, if
detectors a, b, and c detected initializers a1, b1, b2, and c1,
c1 would depend on b2, b2 on b1, and b1 on a1:
------ ------ ------ ------
| c1 | --> | b2 | --> | b1 | --> | a1 |
------ ------ ------ ------
This could cause a dependency cycle in certain situations, for
example because the user had already configured b1 to depend on b2.
This commit reduces the risk of a cycle being created by batching
the initializers by their detector, with dependencies being
configured between each batch rather than between every initializer.
In the example above, this results in c1 depending on b1 and b2,
and b1 and b2 depending on a1:
------
------ | b1 | ------
| c1 | --> | | --> | a1 |
------ | b2 | ------
------
As b1 and b2 were detected by the same detector, no dependency
between those initializers is defined.
Closes gh-27131
2021-07-19 20:00:59 +01:00
4d30eb453f
Adopt Hiberate's CamelCaseToUnderscoresNamingStrategy
...
Closes gh-27352
2021-07-19 13:19:49 +01:00
8540bc0d12
Polish restoration of ConfigFileApplicationListener
...
See gh-27303
2021-07-14 18:01:34 +01:00
be5e8b3139
Restore ConfigFileApplicationListener in deprecated form
...
Restore `ConfigFileApplicationListener` in a deprecated form since
Spring Cloud need it. Scheduled removal is now in 3.0.0.
See gh-27303
2021-07-14 08:30:11 -07:00
c406dda181
Deprecate AbstractDataSourceInitializer
...
Closes gh-27206
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-07-14 13:39:14 +01:00
dc5acb0019
Remove deprecated code flagged for removal
...
Closes gh-27303
2021-07-14 11:50:01 +02:00
9ccd6a6f2f
Merge branch '2.5.x'
...
Closes gh-27307
2021-07-13 15:56:32 +01:00
705feeed6a
Polish "Allow additional JVM args when running tests via toolchain"
...
See gh-27089
2021-07-13 15:28:04 +01:00
01b0156fed
Allow additional JVM args when running tests via toolchain
...
See gh-27089
2021-07-13 15:24:45 +01:00
d8d98e615b
Merge branch '2.5.x'
...
Closes gh-27223
2021-07-09 12:22:33 +01:00
94f94f30f5
Polish "Detect AbstractDataSourceInitializers as DB initializers"
...
See gh-27215
2021-07-09 12:05:56 +01:00
433f3d6bc4
Detect AbstractDataSourceInitializers as DB initializers
...
See gh-27215
2021-07-09 12:04:17 +01:00
d82b46b718
Merge branch '2.5.x' into main
...
Closes gh-27212
Closes gh-27213
2021-07-08 13:05:46 -07:00
0f70c46746
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27210
Closes gh-27211
2021-07-08 13:04:48 -07:00
42e556dd73
Handle file with name matching an optional wildcard location
...
Previously, the presence of a file with the same name
as an optional wildcard location would cause a failure. With
this change the pattern is resolved only if the resource is a
directory.
Additionally, if an optional wildcard search location that was a file
would also fail with an exception. This commit fixes that so that those
locations are not resolved.
Fixes gh-27120
Fixes gh-27209
2021-07-08 13:01:15 -07:00
bd1b73be94
Merge branch '2.5.x'
...
Closes gh-27186
2021-07-08 09:18:45 +01:00
283b4a6ed2
Improve error message for non-options-capable ConnectionFactory
...
Fixes gh-26977
2021-07-08 09:17:55 +01:00
fa1eb544c1
Merge branch '2.5.x'
...
Closes gh-27155
2021-07-06 09:10:13 +02:00
888393d63b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27154
2021-07-06 09:10:03 +02:00
5ec0c7ed12
Polish "Fix duration to microseconds conversion"
...
See gh-27149
2021-07-06 09:07:48 +02:00
a406a46fa1
Fix duration to microseconds conversion
...
See gh-27149
2021-07-06 09:07:47 +02:00
1f3b32c3b9
Merge branch '2.5.x' into main
...
Closes gh-27138
2021-07-01 15:46:21 -07:00
55593a7ac1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27137
2021-07-01 15:46:00 -07:00
eb4144eb97
Add clarification on when @DevaultValue is used during binding
...
Closes gh-26742
2021-07-01 15:39:16 -07:00
8b9991fcc7
Merge branch '2.5.x'
...
Closes gh-27076
2021-06-24 14:07:17 +01:00
5a9fa3c8f1
Only close context that is active
...
Previously, SpringApplicationShutdownHook would call close() on any
registered application context even if it wasn't active as it had
already been closed. This could lead to deadlock if the context was
closed and System.exit was called during application context refresh.
This commit updates SpringApplicationShutdownHook so that it only
calls close() on active contexts. This prevents deadlock as it avoids
trying to sychronize on the context's startupShutdownMonitor on
the shutdown hook thread while it's still held on the main thread
which called System.exit and is waiting for all of the shutdown hooks
to complete.
Fixes gh-27049
2021-06-24 14:07:02 +01:00
9b91c18163
Merge branch '2.5.x'
...
See gh-27073
2021-06-24 09:53:20 +01:00
e2d68aa8b2
Merge branch '2.4.x' into 2.5.x
...
See gh-27072
2021-06-24 09:53:04 +01:00
a7872f47da
Minimize Instantiator's public API
...
See gh-27043
2021-06-24 09:27:08 +01:00
6686a49b1f
Merge branch '2.5.x'
...
Closes gh-27074
2021-06-24 00:04:44 -07:00
b093db104c
Pass ResourceLoader.getClassLoader() to Instantiator
...
Update calls to `Instantiator` to that they also include
`ResourceLoader.getClassLoader()`.
Closes gh-27071
2021-06-24 00:03:16 -07:00
fe34bcdd52
Merge branch '2.5.x'
...
Closes gh-27073
2021-06-23 23:33:18 -07:00
641dfbdf98
Merge branch '2.4.x' into 2.5.x
...
Fixes gh-27072
2021-06-23 23:32:50 -07:00
5088927f80
Pass ClassLoader to Instantiator
...
Update `Instantiator` so that it can accept a `ClassLoader` when
creating instances and rework `EnvironmentPostProcessorsFactory` to
use the new methods.
Prior to this commit we would use the `ClassLoader` to get the class
names from `SpringFactories` but not when actually creating the
instances.
Fixes gh-27043
2021-06-23 23:30:53 -07:00
6102f10639
Merge branch '2.5.x'
2021-06-23 21:02:36 -07:00
2c518f1dff
Merge branch '2.4.x' into 2.5.x
2021-06-23 21:02:05 -07:00
b141fcf51d
Merge branch '2.5.x'
...
Closes gh-27061
2021-06-23 21:01:05 -07:00
84fab65b9a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27060
2021-06-23 21:00:46 -07:00
ea62967ef4
Improve "reason" message in BindFailureAnalyzer
...
Update `BindFailureAnalyzer` so that the "Reason" message includes
the root cause exception type and message.
Closes gh-27028
2021-06-23 20:54:01 -07:00
0e28e24123
Rethrow ConverterNotFoundException when possible
...
Update `BindConverter` to throw the first `ConversionFailedException`
rather than always throwing `ConverterNotFoundException`.
See gh-27028
2021-06-23 20:53:35 -07:00
fe95c2a80c
Merge branch '2.5.x'
...
Closes gh-27059
2021-06-23 17:47:19 -07:00
a77e116c03
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27058
2021-06-23 17:47:08 -07:00
93d316ddd1
Add additional ConfigDataProperties tests
...
Add more `isActive` tests to cover negative cases.
See gh-27017
2021-06-23 17:46:23 -07:00
b91c66b823
Fix typo in ConfigDataPropertiesTests
...
See gh-27017
2021-06-23 17:38:46 -07:00
515072b2e1
Merge branch '2.5.x'
...
Closes gh-27018
2021-06-22 10:29:42 +01:00
cf940fd374
Disable Log4j2's shutdown hook by default
...
Previously, Log4j2's own shutdown hook was only disabled when Log4j2
detected javax.servlet.Servlet on the classpath and, therefore,
determined that it was running in a web application. In an application
without Servlet on the classpath, this could lead to both Log4j2's shut
down hook and and logging system's shutdown handler both stopping
Log4j2. This could result in a failure as the second attempt at stopping
would result in reinitialization which would fail as the JVM is already
shutting down.
This commit introduces a new Log4j2 PropertySource implementation,
registered via META-INF/services, that sets the
log4j.shutdownHookEnabled property to false. This will ensure that
Log4j2's own shutdown hook is disabled by default whenever Spring Boot
is on the classpath and not just in Servlet-based web applications.
Fixes gh-26953
2021-06-22 10:17:25 +01:00
142a68292c
Merge branch '2.5.x'
...
Closes gh-27011
2021-06-22 08:21:41 +02:00
168478f68c
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27010
2021-06-22 08:21:31 +02:00
2252deb69b
Document uuid support in RandomValuePropertySource
...
See gh-26975
2021-06-22 08:16:55 +02:00
86dc156162
Merge branch '2.5.x'
...
Closes gh-27006
2021-06-21 18:37:43 -07:00
f914dc15fc
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27005
2021-06-21 18:37:08 -07:00
8189e82c02
Allow nested profile-specific resolution
...
Effectively revert commit 0da0d2d46
2021-06-21 18:30:03 -07:00
a983a4ae07
Merge branch '2.5.x'
...
Closes gh-26989
2021-06-21 12:07:06 +01:00
580b1b81ab
Fix HTTP/2 over TLS with Jetty 10
...
Fixes gh-26988
2021-06-21 12:06:10 +01:00
fffe2e4f97
Include caller info in NoSuchMethodError failure analysis
...
Fixes gh-26895
2021-06-17 13:46:51 -05:00
b1c04e91d7
Merge branch '2.5.x'
...
Closes gh-26951
2021-06-17 19:43:57 +01:00
5d20edc666
Allow BFPP to modify database initialization ordering
...
Fixes gh-26899
2021-06-17 18:08:39 +01:00
69b730521a
Merge branch '2.5.x'
...
See gh-26936
2021-06-17 11:55:26 +01:00
566a642ce7
Merge branch '2.4.x' into 2.5.x
...
See gh-26935
2021-06-17 11:54:54 +01:00
204dd29c51
Fix test on Windows
...
See gh-26821
2021-06-17 11:54:24 +01:00
2d44119894
Merge branch '2.5.x'
...
Closes gh-26943
2021-06-17 11:43:15 +01:00
7ee3b287e1
Catch isEmbedded failure and treat database as not embedded
...
Fixes gh-26926
2021-06-17 11:42:26 +01:00
fb8f7afce5
Merge branch '2.5.x'
...
Closes gh-26942
2021-06-17 11:24:28 +01:00
7cd2d6474c
Only check database's type when there are scripts to apply
...
Fixes gh-26925
2021-06-17 09:55:33 +01:00
7bd6611e4c
Merge branch '2.5.x'
...
Closes gh-26940
2021-06-16 22:43:52 -07:00
c3b873c11d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26939
2021-06-16 22:43:13 -07:00
b5c92d5174
Allow indirect standard profile-specific imports
...
Effectively revert commit d1b256a169
2021-06-16 22:30:29 -07:00
256a523e84
Merge branch '2.5.x'
...
Closes gh-26936
2021-06-16 16:00:09 -05:00
79f47b150a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26935
2021-06-16 15:59:38 -05:00
5147fcacdf
Improve BeanNotOfRequiredTypeFailureAnalyzer output
...
This commit modifies the output of BeanNotOfRequiredTypeFailureAnalyzer
to include type information for both the actual and the required types
and to remove ambiguity.
Fixes gh-26821
2021-06-16 14:44:11 -05:00
caa87f1a90
Merge branch '2.5.x'
...
Closes gh-26911
2021-06-15 08:24:30 +02:00
eeefaf4314
Fix Javadoc deprecated since
...
See gh-26907
2021-06-15 08:23:13 +02:00
d5d23d73e7
Polish "Allow SpringApplicationBuilder to specify a ResourceLoader"
...
See gh-26690
2021-06-14 08:17:52 +02:00
Stephane Nicoll
Andy Wilkinson
Phillip Webb
Anthony Vanelverdinghe
Brian Clozel
Guirong Hu
izeye
Piotr P. Karwasz
Madhura Bhave
Scott Frederick
prd
qxo
dugenkui
Moritz Halbritter
dugenkui03
Chris Hut
Vikey Chen
Moritz Halbritter
Pavel Anisimov
gcoppex
Henning Poettker
Yanming Zhou
minkyu-jo
Lachlan Roberts
Jonatan Ivanov
Stefano Cordio
Artur Signell
Leo Li
Guillaume Husta
fml2
dreis2211
Susmitha
smoothbear
bono007
Julien Dubois
wuwen
Dmytro Nosan
saraswathy-krish
marckchr
fengyuanwei
Sviatoslav Hryb