Commit Graph

4102 Commits

Author SHA1 Message Date
Alexis Couvreur
47c8a859ea Support NestedConfigurationProperty for record types
Add ElementType.RECORD_COMPONENT to NestedConfigurationProperty and
implement isMarkedAsNested for RecordParameterPropertyDescriptor.

This will allow nested records to be properly harvested for their
properties.

See gh-41251
2024-07-04 10:58:51 +02:00
Phillip Webb
1a699aee24 Merge branch '3.2.x' into 3.3.x
Closes gh-41252
2024-06-26 16:27:41 -07:00
Phillip Webb
962936370a Don't report already migrated properties
Update `PropertiesMigrationReporter` so that already migrated properties
are not reported. Prior to this commit, if a deprecated property was
replaced by a property that could bind with the name relaxed name it
would be reported. For example: `test.someproperty` being replaced with
`test.some-property`.

In order to check the actual underlying property name, the
`PropertySourceOrigin` class has been updated so that it is always
returned, even if another `Origin` is available.

Fixes gh-35774
2024-06-26 16:24:32 -07:00
Phillip Webb
a3377b0672 Merge branch '3.2.x' into 3.3.x
Closes gh-41236
2024-06-25 17:08:29 -07:00
Phillip Webb
8bcdb4b06b Improve error message when spring.config.import fails to resolve
Update `StandardConfigDataLocationResolver` to give a better error
message when a location cannot be resolved. Prior to this commit, a
location with a misspelling in the prefix would only give an error
about the file extension being not known.

Fixes gh-36243
2024-06-25 17:08:24 -07:00
Phillip Webb
6d0c68f9f6 Merge branch '3.2.x' into 3.3.x
Closes gh-41225
2024-06-24 16:04:51 -07:00
Andy Wilkinson
98c11bb5df Use consistent current thread context classloader for initialization
Ensure `Thread.currentThread().getContextClassLoader()` returns the same
classloader for all types of initialization.

Prior to this commit, `JettyEmbeddedWebAppContext` would return a
different classloader when initializing Servlet and Filter classes. This
was due to the fact that our `deferredInitialize()` method has called
outside of a `getContext().call(...)`.

Fixes gh-37649

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-06-24 16:03:00 -07:00
Phillip Webb
9dda006a18 Merge branch '3.2.x' 2024-06-19 22:55:00 -07:00
Phillip Webb
2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07:00
Phillip Webb
705aad4b31 Merge branch '3.2.x'
Closes gh-41152
2024-06-18 17:01:22 -07:00
Phillip Webb
242263d8d4 Update GitProperties date/time coercion to deal with more patterns
Update `GitProperties` to deal with updated date/time patterns that
are now used by the `git-commit-id` maven plugin. Previous patterns are
still supported as a fallback.

Fixes gh-41109
2024-06-18 17:01:03 -07:00
Phillip Webb
8a9feb0bb6 Merge branch '3.2.x'
Closes gh-41141
2024-06-17 16:51:53 -07:00
Phillip Webb
60b7e6cf23 Allow 'status' and 'error' to be excluded from error response
Update `ErrorAttributeOptions` to allow the `status` and `error`
fields to be excluded from the response without throwing a
NullPointerException.

Fixes gh-30011
2024-06-17 16:48:28 -07:00
Phillip Webb
df087fad9e Merge branch '3.2.x'
Closes gh-41108
2024-06-14 11:03:13 -07:00
Phillip Webb
96586525d5 Make DelegatingFilterProxyRegistrationBeanTests idempotent
Fixes gh-38630
2024-06-14 11:03:09 -07:00
Andy Wilkinson
9817ff5622 Prevent double-processing of <include>s when using AOT
Fixes gh-41081
2024-06-12 20:20:12 +01:00
Phillip Webb
147240aa0c Merge branch '3.2.x'
Closes gh-41080
2024-06-11 13:32:30 -07:00
Phillip Webb
bcbcafaab2 Polish "Use method references when possible in test code"
See gh-40974
2024-06-11 12:58:04 -07:00
Ahmed Ashour
207327d97c Use method references when possible in test code
See gh-40974
2024-06-11 12:58:00 -07:00
Phillip Webb
41c93c53e5 Merge branch '3.2.x'
Closes gh-41079
2024-06-11 12:31:43 -07:00
Ahmed Ashour
4f6509d5ff Prevent unnecessary unboxing
See gh-40985
2024-06-11 12:24:13 -07:00
Ahmed Ashour
623c395c0c Remove redundant cast
See gh-40985
2024-06-11 12:24:13 -07:00
Phillip Webb
255bcc28e6 Merge branch '3.2.x'
Closes gh-41077
2024-06-11 10:48:52 -07:00
Phillip Webb
ecc9a2352d Polish "Use constructor rather than Collection.addAll"
See gh-41053
2024-06-11 10:02:27 -07:00
Piyal Ahmed
17adcfc180 Use constructor rather than Collection.addAll
See gh-41053
2024-06-11 09:39:45 -07:00
Andy Wilkinson
781d7b0394 Merge branch '3.2.x'
Closes gh-41010
2024-06-07 13:08:34 +01:00
Andy Wilkinson
fe536bf075 Allow SSL to be used with Tomcat's Http11Nio2Protocol
Fixes gh-41007
2024-06-07 12:46:19 +01:00
Andy Wilkinson
45f09df7fe Merge branch '3.2.x'
Closes gh-40996
2024-06-05 14:27:16 +01:00
Andy Wilkinson
d4e9f458a3 Fix path handling and wrapping in LoaderHidingResource
Closes gh-39472
2024-06-05 12:33:21 +01:00
Andy Wilkinson
2ceb7b4217 Extract LoaderHidingResource as a top-level type
See gh-39472
2024-06-05 12:33:20 +01:00
Moritz Halbritter
70946b7f2f Merge branch '3.2.x'
Closes gh-40983
2024-06-04 09:06:53 +02:00
Yanming Zhou
5cfd079c55 Remove unnecessary null check
See gh-40963
2024-06-04 08:39:26 +02:00
Scott Frederick
fa131fa6a0 Merge branch '3.2.x'
Closes gh-40959
2024-05-30 15:16:27 -05:00
Ahmed Ashour
f000af6a12 Remove unused parameter and polish javadoc
See gh-40955
2024-05-30 14:42:46 -05:00
Fouad Almalki
fad0f0a83d Add newline before the Spring banner
See gh-40889
2024-05-29 14:16:37 +02:00
Phillip Webb
82d8222f56 Polish 2024-05-24 18:10:03 -07:00
Andy Wilkinson
da4c2db3a7 Ensure default mime mappings are applied
Fixes gh-40860
2024-05-22 12:19:31 +01:00
Phillip Webb
88917b554b Merge branch '3.2.x'
Closes gh-40846
2024-05-20 21:32:12 -07:00
Phillip Webb
39ab959af8 Merge branch '3.1.x' into 3.2.x
Closes gh-40845
2024-05-20 21:06:59 -07:00
Phillip Webb
f743dc82fc Improve graceful shutdown documentation to remove ambiguity
Closes gh-40108
2024-05-20 21:06:22 -07:00
Andy Wilkinson
6257dc8b7b Merge branch '3.2.x'
See gh-40743
2024-05-13 20:31:14 +01:00
Andy Wilkinson
5db9f59094 Rework Jetty graceful shutdown to address race condition with 12.0.9
See gh-40724
2024-05-13 20:29:28 +01:00
Andy Wilkinson
bc436564e2 Upgrade to Jetty 12.0.9
Closes gh-40743
2024-05-13 15:55:52 +01:00
Andy Wilkinson
e0f93448f6 Upgrade to Jetty 12.0.9
Closes gh-40724
2024-05-13 14:57:13 +01:00
Andy Wilkinson
772e4ca78d Merge branch '3.2.x'
Closes gh-40691
2024-05-10 12:37:39 +01:00
Andy Wilkinson
e55773d14e Merge branch '3.1.x' into 3.2.x
Closes gh-40690
2024-05-10 12:37:29 +01:00
Andy Wilkinson
a67c8e4bbd Perform analysis even when property is not in the environment
Closes gh-33261
2024-05-10 12:36:59 +01:00
Moritz Halbritter
fb64e95271 Merge branch '3.2.x'
Closes gh-40638
2024-05-08 14:06:43 +02:00
Moritz Halbritter
92f7414fad Favor Duration accepting timeout method over int method
Closes gh-40635
2024-05-08 14:01:09 +02:00
Moritz Halbritter
d3e49747b0 Merge branch '3.2.x' 2024-05-02 14:48:37 +02:00