Stéphane Nicoll
a195c43d43
Merge branch '3.2.x' into 3.3.x
2024-08-08 08:48:37 +02:00
Stéphane Nicoll
877f57fea7
Fix formatting
2024-08-08 08:47:52 +02:00
Stéphane Nicoll
93359c88e0
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41716
2024-08-08 08:40:50 +02:00
Stéphane Nicoll
9c5b85bc07
Add TWENTY_THREE to JavaVersion enum
...
This commit uses JRE#OTHER as JUnit does not have support for Java 23
yet, see https://github.com/junit-team/junit5/issues/3918
Closes gh-41710
2024-08-07 20:06:17 +02:00
Andy Wilkinson
87417c0536
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41633
2024-07-29 11:57:09 +01:00
Andy Wilkinson
4ee24bf9bd
Polish "Add rule to prevent calls to Objects.requireNonNull()"
...
See gh-41611
2024-07-29 11:41:26 +01:00
Andy Wilkinson
c642f6d268
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41613
2024-07-25 16:16:35 +01:00
Andy Wilkinson
5f666eec5b
Reduce warnings reported by Eclipse
...
Closes gh-41598
2024-07-25 14:55:00 +01:00
Andy Wilkinson
72fd3f9392
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41589
2024-07-23 10:06:15 +01:00
Andy Wilkinson
72867a3b25
Broaden test coverage for property binding with @Name
...
Closes gh-41588
2024-07-23 09:39:17 +01:00
Phillip Webb
36b1214feb
Merge branch '3.2.x' into 3.3.x
2024-07-22 18:30:45 +01:00
Phillip Webb
61dc82d836
Update copyright year of changed files
2024-07-22 18:16:19 +01:00
Phillip Webb
ff1a4654d2
Polish
2024-07-22 18:15:57 +01:00
Andy Wilkinson
8e82aad6ff
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41563
2024-07-19 16:29:15 +01:00
Andy Wilkinson
a10b000119
Fix constructor binding of EnumMaps
...
Fixes gh-41550
2024-07-19 16:28:16 +01:00
Andy Wilkinson
ecbbe6a9cb
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41448
2024-07-11 13:16:59 +01:00
Andy Wilkinson
8bc45a20d7
Polish "Fix typos in BootstrapContext javadoc"
...
See gh-41443
2024-07-11 13:16:38 +01:00
John Blum
47fc9111cb
Fix typos in BootstrapContext javadoc
...
See gh-41443
2024-07-11 13:16:10 +01:00
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