e12269ef1a
Merge branch '6.0.x'
2023-11-14 20:01:14 +00:00
ac235a0c43
Fix checkstyle violation
2023-11-14 20:00:16 +00:00
2613dfce0b
Merge branch '6.0.x'
2023-11-14 19:24:43 +00:00
a4e3af5cbe
Revise HandlerMappingIntrospector caching
...
Expose methods to set and reset cache to use from a Filter instead
of a method to create such a Filter. Also use cached results only
if they match by dispatcher type and requestURI.
See gh-31588
2023-11-14 19:24:29 +00:00
978e81e72e
Merge branch '6.0.x'
2023-11-14 15:15:53 +01:00
e71117dcdf
Polish contribution
...
See gh-31598
2023-11-14 14:46:34 +01:00
d5874ab99e
Avoid duplicate resources in PathMatchingResourcePatternResolver on Windows
...
This commit updates PathMatchingResourcePatternResolver to avoid
returning duplicate resources on MS Windows when searching using the
`classpath*:` prefix and a wildcard pattern that matches resources
which are directly present in a JAR as well as present via classpath
manifest entries.
Closes gh-31598
2023-11-14 14:39:48 +01:00
2b7a9209b3
Merge branch '6.0.x'
2023-11-14 12:52:25 +01:00
99327b7db1
Preserve nested square brackets within parameter name
...
Closes gh-31596
2023-11-14 12:51:19 +01:00
3e06441d97
Cache SpEL-loaded types in StandardTypeLocator
...
Closes gh-31579
2023-11-14 12:46:16 +01:00
8f21479234
Add body conversion capabilities in RestClient::exchange
...
This commit introduces a ConvertibleClientHttpResponse type that
extends ClientHttpResponse, and that can convert the body to a desired
type. Before this commit, it was not easy to use the configured HTTP
message converters in combination with RestClient::exchange.
Closes gh-31597
2023-11-14 11:18:59 +01:00
dd97dee7fd
Polish
2023-11-13 19:33:09 +01:00
eb3982b6c2
Property-driven onRefresh exit for AppCDS purpose
...
This commit allows to terminate the JVM when the
-Dspring.context.exit=onRefresh property is set,
which can be useful for AppCDS training run in order
to get most of the AppCDS cache without starting the
beans.
Closes gh-31595
2023-11-13 15:53:57 +01:00
258f99a8bc
Merge branch '6.0.x'
2023-11-13 14:29:16 +01:00
01f2925048
Upgrade to Micrometer 1.10.13
...
Closes gh-31586
2023-11-13 14:28:45 +01:00
dced3539a3
Upgrade to Context Propagation 1.1.0
...
Closes gh-31599
2023-11-13 14:15:39 +01:00
bb66885426
Upgrade to Micrometer 1.12.0
...
Closes gh-31556
2023-11-13 14:15:02 +01:00
7f615fd8af
Fix reference in deprecation message of parseForwardedFor
2023-11-11 18:05:36 +01:00
33b1ff5d27
Merge branch '6.0.x'
2023-11-10 17:45:24 +00:00
44a37000ec
HandlerMappingIntrospector exposes Filter for caching
...
Closes gh-31588
2023-11-10 17:43:52 +00:00
53fe5fafed
Minor refactoring in HandlerMappingIntrospector
...
See gh-31588
2023-11-10 17:27:54 +00:00
f5453cc445
Polish
2023-11-10 16:42:43 +01:00
b9bd98fc5b
Polishing in HandlerMappingIntrospector
...
See gh-31588
2023-11-10 11:27:44 +00:00
a97ecf7a29
Link to KDoc/Javadoc in their respective counterpart overview pages
...
This commit adds a link in the package-overview pages of KDoc and
Javadoc, pointing to the other documentation's own page.
In order for local tests to work, the build has been slightly modified
to align with the directory structure in the distributed documentation
zip (and consequently with that of the deployed documentation website).
Lastly, the javadoc build was fixed to include the `overview.html` again
in the resulting HTML index, since this is where the KDoc link is added.
See gh-28055
Closes gh-31587
2023-11-10 11:36:27 +01:00
8a7144ba42
Document how to log @Sql scripts and statements
...
Closes gh-31589
2023-11-10 11:19:38 +01:00
6c3a3dc7d9
Polishing
2023-11-10 11:18:26 +01:00
b1a7161218
Document @Sql class-level execution phase support in the reference manual
...
Closes gh-31377
2023-11-09 15:22:14 +01:00
332de60586
Update @Sql docs regarding Kotlin and Java 8
2023-11-09 15:19:52 +01:00
769128a0b2
Merge branch '6.0.x'
2023-11-09 12:53:36 +00:00
7714110940
Polishing in DefaultWebClient
2023-11-09 12:53:15 +00:00
75d1278bde
Include port when logging URI in DefaultWebClient
...
Closes gh-30519
2023-11-09 12:53:15 +00:00
d8441fc80c
Invoke handleEmptyBody if there is no content-type
...
Closes gh-30522
2023-11-09 12:53:05 +00:00
d8ed7c7906
Merge branch '6.0.x'
2023-11-09 13:11:58 +01:00
620f558547
Register hints for superclass in BindingReflectionHintsRegistrar
...
Closes gh-31552
2023-11-09 13:11:36 +01:00
8841b7c3bb
Upgrade to SnakeYAML 2.2
2023-11-09 11:52:02 +01:00
6c00e6162b
Merge branch '6.0.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
# spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java
2023-11-09 11:50:55 +01:00
1e78cc35e5
Log4jLog re-resolves ExtendedLogger on deserialization
...
This is necessary for compatibility with Log4J 2.21, analogous to the existing re-resolution in Spring's SLF4J adapter.
Closes gh-31582
2023-11-09 11:46:22 +01:00
42874178ce
Polish RecordApplicationEvents javadoc: add note on captured threads
...
This commit clarifies that the annotation is used to capture events that
are fired from the test `Thread` or descendant threads, since the test
framework uses `InheritableThreadLocal` to store captured events now.
See gh-31079
See gh-30020
2023-11-09 11:07:53 +01:00
11fdb5ba17
Upgrade to Log4J 2.21.1, Tomcat 10.1.15, Jetty 11.0.18, Undertow 2.3.10, EclipseLink 3.0.4, Mockito 5.7
2023-11-09 10:53:47 +01:00
9957bb6918
Check for procedure vs function constants in CallMetaDataContext
...
Closes gh-31550
2023-11-09 10:52:51 +01:00
9414c2ddba
Coordinated stop before destroy when ExecutorService not terminated yet
...
Closes gh-31549
2023-11-09 10:22:27 +01:00
38724a1205
Fix RestClient generic type handling
...
For client side use case, the context class should be null,
consistently with what is done in HttpMessageConverterExtractor.
Closes gh-31574
2023-11-09 08:50:31 +01:00
55d13a0232
Document @DisabledInAotMode & @[Enabled|Disabled]InNativeImage in ref docs
...
Closes gh-31437
Closes gh-31438
2023-11-08 16:22:35 +01:00
a207e5e1b0
Ensure framework-docs can be imported into Eclipse IDE
2023-11-08 15:26:09 +01:00
b7c579954c
Merge branch '6.0.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
2023-11-08 13:48:22 +01:00
6a7a0bddb7
Restore support for recursive annotations in Kotlin
...
This commit reinstates support for recursive annotations in Kotlin.
See gh-28012
See gh-28618
See gh-31400
Closes gh-31518
2023-11-08 13:28:28 +01:00
ba4d459f81
Merge branch '6.0.x'
2023-11-08 11:47:18 +00:00
5c012bbb0c
Set maxAge correctly when expiring WebSession
...
Closes gh-31214
2023-11-08 11:44:36 +00:00
d34b3c1a71
Merge branch '6.0.x'
2023-11-08 08:04:27 +01:00
e943058b18
Merge pull request #31571 from izeye
...
* pr/31571:
Add Javadoc since to ProblemDetail.setProperties()
Closes gh-31571
2023-11-08 08:04:10 +01:00
rstoyanchev
Sam Brannen
Jason
Juergen Hoeller
Arjen Poutsma
Stéphane Nicoll
Sébastien Deleuze
Brian Clozel
Simon Baslé
lorenzsimon