Sam Brannen
e09cdcd920
Remove convention-based annotation attribute override support
...
This commit completely removes all support for convention-based
annotation attribute overrides in Spring's annotation utilities and the
MergedAnnotations infrastructure.
Composed annotations must now use @AliasFor to declare explicit
overrides for attributes in meta-annotations.
See gh-28760
Closes gh-28761
2025-03-06 16:28:21 +01:00
Sam Brannen
d722b9434e
Merge branch '6.2.x'
2025-03-06 16:27:48 +01:00
Sam Brannen
2d88f18bf1
Update Javadoc
2025-03-06 16:26:40 +01:00
Sam Brannen
15a6641677
Clean up warnings in Gradle build
2025-03-06 16:26:32 +01:00
Juergen Hoeller
2a98b3137d
Merge branch '6.2.x'
2025-03-06 15:45:18 +01:00
Juergen Hoeller
63c8e7cb5d
Restore lenient matching of unresolved nested bound
...
Closes gh-34541
2025-03-06 15:44:12 +01:00
Sam Brannen
52e01bbb62
Merge branch '6.2.x'
2025-03-06 13:31:46 +01:00
Sam Brannen
c5ecc50bfe
Document wrapping behavior for TestExecutionListener callbacks
...
Closes gh-34422
2025-03-06 13:31:23 +01:00
Sam Brannen
0fd94f1b9f
Polishing
2025-03-06 13:30:20 +01:00
Sam Brannen
cd4e73a4a3
Fix typos in CloseStatus comments
...
Closes gh-34548
2025-03-06 10:26:07 +01:00
Juergen Hoeller
a605f07100
Merge branch '6.2.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
2025-03-05 22:47:24 +01:00
Juergen Hoeller
2472126475
Add fallback to pre-6.2.3 behavior for unresolvable generics
...
Closes gh-34535
2025-03-05 22:45:22 +01:00
Juergen Hoeller
f3b50c9a58
Ignore null beans in SimpleAutowireCandidateResolver.resolveAutowireCandidates
...
Closes gh-34543
2025-03-05 22:44:09 +01:00
Sam Brannen
5a0848b579
Merge branch '6.2.x'
2025-03-05 14:10:41 +01:00
Sam Brannen
0a6e666857
Ensure GenericTypeResolverTests compiles with Eclipse compiler
2025-03-05 14:07:52 +01:00
Juergen Hoeller
2fbd54078b
Merge branch '6.2.x'
...
# Conflicts:
# spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
# spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
2025-03-04 18:46:39 +01:00
Juergen Hoeller
403362fe3c
Polishing
2025-03-04 18:44:56 +01:00
Juergen Hoeller
534f123fe8
Add explicit FileSystemResource path check for trailing slash
...
Closes gh-34509
2025-03-04 18:44:25 +01:00
Sam Brannen
ca7ebd60ed
Stop using deprecated ReflectionHintsPredicates.onMethod() on main
2025-03-04 11:21:37 +01:00
Sam Brannen
702c63a7e8
Merge branch '6.2.x'
2025-03-03 17:40:39 +01:00
Sam Brannen
e421104cf3
Supply RuntimeHints to an AotContextLoader
...
This commit introduces a new loadContextForAotProcessing(...) variant
in AotContextLoader which accepts a RuntimeHints argument. This new
method is an interface default method which delegates to the existing
loadContextForAotProcessing(MergedContextConfiguration) variant for
backward compatibility.
In addition, the original loadContextForAotProcessing(...) variant is
now deprecated and has been converted to an interface default method
which throws an UnsupportedOperationException.
Note, however, that the framework now only invokes the new
loadContextForAotProcessing(...) variant within TestContextAotGenerator.
Closes gh-34513
2025-03-03 17:39:56 +01:00
Sam Brannen
adfeba23e0
Polishing
2025-03-03 17:39:47 +01:00
Sam Brannen
955cc2039b
Merge branch '6.2.x'
2025-03-03 15:05:11 +01:00
Sam Brannen
7789e12575
Polishing
2025-03-03 15:04:42 +01:00
Sam Brannen
5ffd88cd89
Remove deprecated rowsExpected property of SqlQuery
...
Closes gh-34530
Co-authored-by: Yanming Zhou <zhouyanming@gmail.com >
2025-03-03 14:45:22 +01:00
Sam Brannen
e9345f16dc
Merge branch '6.2.x'
2025-03-03 14:34:06 +01:00
Sam Brannen
30d793cefe
Revise deprecation of SqlQuery.rowsExpected
...
Closes gh-34526
2025-03-03 14:33:19 +01:00
Yanming Zhou
78cc5df748
Deprecate unused "rowsExpected" property of SqlQuery for removal
...
See gh-34526
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com >
2025-03-03 14:33:14 +01:00
Juergen Hoeller
3632c09348
Merge branch '6.2.x'
2025-03-03 13:34:14 +01:00
Juergen Hoeller
5ffaea7a43
Avoid JarURLConnection resource leak in AbstractFileResolvingResource.exists()
...
Closes gh-34528
2025-03-03 13:32:51 +01:00
Brian Clozel
84a57861d1
Merge branch '6.2.x'
2025-03-03 11:24:09 +01:00
Brian Clozel
1633ad24f3
Ignore nohttp check on buildSrc/build
2025-03-03 11:23:21 +01:00
Rhett CfZhuang
5faf2ed7f4
Fix missing Partitioned cookie support in reactive HTTP clients
...
This commit adds support for the Partitioned cookie attribute in the
reactive HTTP clients that support this: Reactor and HttpComponents.
Closes gh-34521
Signed-off-by: Rhett CfZhuang <dark.momo985@gmail.com >
[brian.clozel@broadcom.com: rework tests and support HttpComponents]
Signed-off-by: Brian Clozel <brian.clozel@broadcom.com>
2025-03-03 11:23:13 +01:00
Sébastien Deleuze
7bc712e304
Upgrade NullAway to 0.12.4
...
This commit also slightly refines nullness but without
significant user-side impact expected.
Closes gh-34525
2025-03-03 08:45:54 +01:00
Sébastien Deleuze
f7db4bf4f0
Fix a compilation warning in spring-webflux
2025-03-02 19:15:26 +01:00
Juergen Hoeller
533ecf0244
Merge branch '6.2.x'
2025-03-01 22:21:39 +01:00
Juergen Hoeller
d2733cea36
Notify lenientCreationFinished condition after locked creation as well
...
Closes gh-34522
2025-03-01 22:20:23 +01:00
Sam Brannen
99d5e90b5e
Merge branch '6.2.x'
2025-03-01 13:39:14 +01:00
Johnny Lim
108caea385
Use ORDER constant in MockitoResetTestExecutionListener
...
See gh-34404
Closes gh-34445
Signed-off-by: Johnny Lim <izeye@naver.com >
2025-03-01 13:35:46 +01:00
rstoyanchev
788b66feac
Remove UrlPathHelper in ServletWebSocketHandlerRegistry
...
See gh-34508
2025-02-28 16:20:38 +00:00
rstoyanchev
6a9783bb1a
Merge branch '6.2.x'
2025-02-28 14:41:47 +00:00
rstoyanchev
7e9ac120ac
Deprecate UrlPathHelper in ServletWebSocketHandlerRegistry
...
Closes gh-34508
2025-02-28 14:39:29 +00:00
Juergen Hoeller
b610711235
Merge branch '6.2.x'
2025-02-28 14:15:36 +01:00
Juergen Hoeller
c64dae3623
Avoid getTargetConnection call on transaction-aware Connection close
...
Closes gh-34484
2025-02-28 14:12:51 +01:00
Juergen Hoeller
559ea6c480
Defensively call isShutdown method for executor description
...
Closes gh-34514
2025-02-28 14:11:57 +01:00
Sébastien Deleuze
fec0bfe6b3
Merge branch '6.2.x'
2025-02-28 12:06:30 +01:00
Tran Ngoc Nhan
34315fc20f
Fix web and webflux reference links
...
Closes gh-34517
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com >
2025-02-28 12:06:11 +01:00
Juergen Hoeller
03cce13937
Merge branch '6.2.x'
2025-02-27 22:54:07 +01:00
Juergen Hoeller
3bb4795d43
Resolve variable bounds at outermost recursion level only
...
Closes gh-34504
2025-02-27 22:51:41 +01:00
Yanming Zhou
7f020118eb
Polish JdbcTemplate to use getter instead of field
...
1. align with others in the same source file
2. allow subclass to override
Closes: gh-34501
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com >
2025-02-27 19:11:14 +01:00
