Sam Brannen
e05d4f2f18
Merge branch '6.2.x'
2025-03-18 16:42:37 +01:00
Sam Brannen
c6a9aa59a3
Remove BDDMockito Checkstyle rule
...
This commit removes the BDDMockito Checkstyle rule, since it did not
actually enforce the use of BDDMockito.
This commit also updates static imports to use Mockito instead of
BDDMockito where appropriate (automated via the Eclipse IDE Organize
Imports clean-up task).
Closes gh-34616
2025-03-18 16:35:57 +01:00
Sam Brannen
d6a7aefd1d
Add comments regarding Java 1.8 byte code level for CGLIB
...
Unfortunately, it is not possible to raise the byte code level beyond
Java 1.8 for classes generated using CGLIB due to the fact that CGLIB
generates STATICHOOK methods which set static final fields outside the
initializer method <clinit> (i.e., a static initialization block).
Attempting to raise the level to Java 17 (or even Java 9) results in
exceptions like the following.
Caused by: java.lang.IllegalAccessError: Update to static final field
org.example.MyBean$$SpringCGLIB$$0.CGLIB$THREAD_CALLBACKS attempted from
a different method (CGLIB$STATICHOOK1) than the initializer method <clinit>
at org.example.MyBean$$SpringCGLIB$$0.CGLIB$STATICHOOK1(<generated>)
at org.example.MyBean$$SpringCGLIB$$0.<clinit>(<generated>)
This commit therefore introduces inline comments pointing out why we
stay with Java 1.8 byte code level with CGLIB.
See gh-34602
2025-03-18 12:40:28 +01:00
Juergen Hoeller
a0763d13c5
Merge branch '6.2.x'
2025-03-17 19:24:30 +01:00
Juergen Hoeller
760376c318
Restore check for jar root existence (now via getEntryName/getJarEntry)
...
Closes gh-34607
2025-03-17 19:20:41 +01:00
Juergen Hoeller
5b6abe4c13
Upgrade to ASM 9.8 (for early Java 25 support)
...
Closes gh-34600
2025-03-17 19:16:42 +01:00
Sébastien Deleuze
90e32cadeb
Merge branch '6.2.x'
2025-03-13 12:58:04 +01:00
Sébastien Deleuze
c9050607bc
Fix StringUtils#uriDecode Javadoc
...
Closes gh-34590
2025-03-13 12:57:44 +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
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
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
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
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
Juergen Hoeller
b610711235
Merge branch '6.2.x'
2025-02-28 14:15:36 +01:00
Juergen Hoeller
559ea6c480
Defensively call isShutdown method for executor description
...
Closes gh-34514
2025-02-28 14:11:57 +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
Juergen Hoeller
fb77fcd922
Merge branch '6.2.x'
2025-02-26 10:33:19 +01:00
Juergen Hoeller
06721ba6c0
Lenient fallback when cached WeakReference returns null
...
Closes gh-34423
2025-02-26 10:24:24 +01:00
Juergen Hoeller
7c4594c014
Merge branch '6.2.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java
# spring-core/src/main/java/org/springframework/aot/hint/support/FilePatternResourceHintsRegistrar.java
2025-02-23 15:29:38 +01:00
Juergen Hoeller
634d1dd20b
Consistent default ClassLoader fallback in hint classes
...
Closes gh-34470
2025-02-23 15:15:25 +01:00
Juergen Hoeller
1aea698088
Merge branch '6.2.x'
2025-02-23 14:04:31 +01:00
Juergen Hoeller
725b02a66d
Ignore entries cache if no matching root entry path found
...
Closes gh-34446
2025-02-23 14:02:57 +01:00
Sam Brannen
fe41cd6d20
Merge branch '6.2.x'
2025-02-13 16:39:21 +01:00
Sam Brannen
9e45178202
Stop referring to "Java 8" in AnnotationUtils
2025-02-13 15:59:20 +01:00
Sam Brannen
d82e70e345
Cross reference annotation search APIs in Javadoc
...
Closes gh-34421
2025-02-13 15:59:08 +01:00
Juergen Hoeller
4d6947d14f
Merge branch '6.2.x'
2025-02-12 19:20:01 +01:00
Juergen Hoeller
bbb593db48
Consistently ignore non-jar files in classpath
...
Closes gh-34417
2025-02-12 19:18:30 +01:00
rstoyanchev
e9d16da633
Remove Netty 5 support
...
Closes gh-34345
2025-02-11 12:27:33 +00:00
Juergen Hoeller
4ba14ca58c
Merge branch '6.2.x'
2025-02-10 15:55:26 +01:00
Juergen Hoeller
1ca941ba9a
Consistently resolve renamed type variables
...
Closes gh-34386
2025-02-10 15:51:39 +01:00
Sam Brannen
1a29fbda48
Restore @Nullable on AnnotatedElementUtils.getAllAnnotationAttributes(...)
...
Closes gh-34394
2025-02-10 10:52:32 +01:00
Juergen Hoeller
3fff3b8a6d
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
# spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
2025-02-07 19:03:37 +01:00
Juergen Hoeller
1a573d6e3c
Lazily retrieve TypeDescriptor annotations on demand
...
Closes gh-33948
2025-02-07 18:55:24 +01:00
rstoyanchev
55a090602b
Merge branch '6.2.x'
2025-02-07 13:23:14 +00:00
rstoyanchev
ff49b0b683
Align AnnotatedMethod#equals and #hashcode
...
See gh-34375
2025-02-07 13:10:55 +00:00
Sébastien Deleuze
7695be0079
Merge branch '6.2.x'
2025-02-06 09:19:42 +01:00
Sébastien Deleuze
dba4881318
Refine the CGLIB error message with native
...
See gh-34370
2025-02-06 09:18:51 +01:00
Sébastien Deleuze
e44a3eb39a
Merge branch '6.2.x'
2025-02-05 17:47:58 +01:00
Sébastien Deleuze
16ec08aec8
Provide a more actionable CGLIB error message with native
...
Closes gh-34370
2025-02-05 17:47:25 +01:00
