spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-25 08:19:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java
#	spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
This commit is contained in:
Juergen Hoeller
2025-11-08 10:03:18 +01:00
parent d9580fd436 38555df3d8
commit 73dfd08526
9 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
+3 -3
View File
@@ -429,14 +429,14 @@ class BridgeMethodResolverTests {
}
public abstract static class AbstractDateAdder implements Adder<Date> {
public abstract static class AbstractAdder<T extends Serializable> implements Adder<T> {
@Override
public abstract void add(Date date);
public abstract void add(T item);
}
public static class DateAdder extends AbstractDateAdder {
public static class DateAdder extends AbstractAdder<Date> {
@Override
public void add(Date date) {