rstoyanchev
e73dc37513
API versioning support for Spring WebFlux
...
Closes gh-34566
2025-03-10 13:53:12 +00:00
rstoyanchev
51d34fff64
API versioning support for Spring MVC
...
See gh-34566
2025-03-10 13:53:12 +00:00
Sébastien Deleuze
e9701a9ce3
Remove support for Aware interfaces in BeanRegistrar
...
Closes gh-34562
2025-03-10 12:14:11 +01:00
Juergen Hoeller
15b251dcd6
Merge branch '6.2.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2025-03-10 11:04:14 +01:00
Juergen Hoeller
70a1b2fae3
Upgrade to Checkstyle 10.21.4
2025-03-10 11:00:53 +01:00
Juergen Hoeller
90ddb40d7a
Upgrade to Jetty 12.0.17 and Jetty Reactive HttpClient 4.0.9
...
Includes Apache HttpClient 5.4.1, Netty 4.1.119, Jackson 2.18.3, Gson 2.12.1, FreeMarker 2.3.34, Protobuf 4.30, Groovy 4.0.26, Jython 2.7.4, JRuby 9.4.12, Caffeine 3.2, QDox 2.2, Awaitility 4.3, EasyMock 5.5, HtmlUnit 4.10
Closes gh-34561
2025-03-10 11:00:35 +01:00
Sébastien Deleuze
91d0ebe327
Refine BeanRegistryAdapterTests
...
Closes gh-34557
2025-03-10 10:39:21 +01:00
Phillip Webb
789791e186
Allow chained BeanRegistry registration
...
Add a `register(BeanRegistry registry)` method to `BeanRegistry`
to allow registration chaining.
See gh-34557
2025-03-10 10:38:50 +01:00
Sébastien Deleuze
a0e2d3a221
Add support for target type to BeanRegistry
...
Closes gh-34560
2025-03-10 10:14:28 +01:00
Juergen Hoeller
c74f897fac
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
2025-03-08 12:23:43 +01:00
Juergen Hoeller
143985e862
Add tests for primary/fallback/defaultCandidate precedence
...
Closes gh-34449
2025-03-08 12:22:14 +01:00
Juergen Hoeller
4bd280b87e
Explain availability and uniqueness (including primary/fallback/default) in javadoc
...
Closes gh-34447
2025-03-08 12:22:04 +01:00
Juergen Hoeller
5877a38fa1
Add explicit note on JSpecify support in Spring Framework 6.2 vs 7.0
...
Closes gh-34551
2025-03-08 12:21:46 +01:00
Yanming Zhou
639af7befa
Add tests to ensure bean definition flag "fallback" take precedence over "defaultCandidate"
...
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com >
2025-03-08 12:21:31 +01:00
Sam Brannen
86d81632c8
Consistently invoke isNullSafe()
2025-03-07 16:58:59 +01:00
Sam Brannen
80df88bd4f
Clean up warnings in Gradle build
2025-03-07 16:58:52 +01:00
Sam Brannen
15a71f94fb
Merge branch '6.2.x'
2025-03-07 13:38:50 +01:00
Vedran Pavic
94d29bac9f
Fix typo in Spring MVC error responses documentation
...
Closes gh-34552
Signed-off-by: Vedran Pavic <vedran@vedranpavic.com >
2025-03-07 13:37:57 +01:00
Sébastien Deleuze
5bd03494d4
Merge branch '6.2.x'
2025-03-07 09:30:28 +01:00
Dmitry Sulman
a6f3f18d89
Allow supertypes in ContentResultMatchersDsl matchers
...
Closes gh-34542
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com >
2025-03-07 09:29:48 +01:00
Sébastien Deleuze
fda9b9a696
Polishing
...
See gh-18353
2025-03-07 09:00:06 +01:00
Sébastien Deleuze
bedc235bab
Document programmatic bean registration
...
This commit adds the reference documentation for the new programmatic
bean registration capabilities for both Java and Kotlin.
Closes gh-18353
2025-03-06 19:15:56 +01:00
Sébastien Deleuze
682e2d6d84
Introduce BeanRegistrarDsl
...
This commit introduces a new BeanRegistrarDsl that supersedes
BeanDefinitionDsl which is now deprecated.
See BeanRegistrarDslConfigurationTests for a concrete example.
See gh-18353
2025-03-06 19:15:56 +01:00
Sébastien Deleuze
496be9ca98
Introduce first-class support for programmatic bean registration
...
This commit introduces a new BeanRegistrar interface that can be
implemented to register beans programmatically in a concise and
flexible way.
Those bean registrar implementations are typically imported with
an `@Import` annotation on `@Configuration` classes.
See BeanRegistrarConfigurationTests for a concrete example.
See gh-18353
2025-03-06 19:14:03 +01:00
Sam Brannen
aeaf52ee96
Merge branch '6.2.x'
2025-03-06 17:32:49 +01:00
Sam Brannen
8334cb1abb
Revise tests to better express intent
2025-03-06 17:32:32 +01:00
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
