Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,461 Commits 18 Branches 0 Tags
cacc63da20f54d93111b86ffd7961b3ce3dcce53
Commit Graph

32461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Clozel
cacc63da20 Merge branch '6.2.x' 2025-03-19 18:19:12 +01:00
Brian Clozel
adb4b675fc Next development version (v6.2.6-SNAPSHOT) 2025-03-19 18:18:50 +01:00
Sam Brannen
92ee20c896 Adhere to new Checkstyle rule 2025-03-19 16:29:03 +01:00
Sam Brannen
8db1340263 Merge branch '6.2.x' 2025-03-19 16:24:18 +01:00
Sam Brannen
208d52d852 Introduce Checkstyle rule for separator symbol location 2025-03-19 15:35:44 +01:00
Sébastien Deleuze
2f8c5a580a Polishing 2025-03-19 15:11:43 +01:00
Sébastien Deleuze
2bc213d703 Allow registering aliases with BeanRegistry 
Closes gh-34599
 2025-03-19 15:11:32 +01:00
rstoyanchev
087d239148 Merge branch '6.2.x' 2025-03-19 12:34:58 +00:00
rstoyanchev
18c3b637e4 Fix dated Javadoc in MvcUriComponentsBuilder 
related to forwarded headers

Closes gh-34615
 2025-03-19 12:33:01 +00:00
rstoyanchev
34c69bfc67 Allow empty comment in ServerResponse.SseBuilder 
Closes gh-34608
 2025-03-19 12:14:37 +00:00
rstoyanchev
37d7af42ac Allow setting ApplicationContext on MockServerWebExchange 
Closes gh-34601
 2025-03-19 11:06:38 +00:00
Juergen Hoeller
73c4b46ed7 Merge branch '6.2.x' 2025-03-19 11:00:39 +01:00
Juergen Hoeller
cc986cd2e8 Defer triggerAfterCompletion invocation in doRollbackOnCommitException 
Closes gh-34595
 2025-03-19 10:59:46 +01:00
Sébastien Deleuze
6ab87477ea Merge branch '6.2.x' 2025-03-18 17:58:38 +01:00
Sébastien Deleuze
0141725638 Polishing 
Closes gh-34592
 2025-03-18 17:50:28 +01:00
Dmitry Sulman
0c2ba4e38e Recursively box/unbox nested inline value classes 
See gh-34592
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
 2025-03-18 17:50:28 +01:00
Sam Brannen
84ba6b4b26 Add package to Javadoc link 2025-03-18 16:52:12 +01:00
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
Juergen Hoeller
69ed984a81 Merge branch '6.2.x' 2025-03-18 16:11:38 +01:00
Juergen Hoeller
ad949a7450 Add includeNonSingletons flag for ObjectProvider stream access 
Closes gh-34591
 2025-03-18 16:10:30 +01:00
Sam Brannen
ce815006d2 Generate compiled SpEL expressions using Java 17 byte code level 
Closes gh-34602
 2025-03-18 12:44:01 +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
86b2617c7f Suggest compilation with -parameters in case of ambiguity 
Closes gh-34609
 2025-03-17 19:22:56 +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
Sam Brannen
30a7f7be28 Merge branch '6.2.x' 2025-03-17 18:13:04 +01:00
Sam Brannen
7a839e988a Make dependencies on AssertJ and JUnit in spring-core-test optional 
This commit also removes unnecessary dependencies in
spring-core-test.gradle and updates framework-docs.gradle accordingly.

Closes gh-34612
 2025-03-17 18:11:25 +01:00
ChanHyeongLee
8ee09e5766 Separate commonly used DepositionTypeCheck into methods 
Closes gh-34573

Signed-off-by: ChanHyeongLee <cksgud410@gmail.com>
[brian.clozel@broadcom.com: apply code conventions]
Signed-off-by: Brian Clozel <brian.clozel@broadcom.com>
 2025-03-17 11:52:18 +01:00
Sébastien Deleuze
de75b6e1a2 Merge branch '6.2.x' 2025-03-17 11:42:06 +01:00
Sébastien Deleuze
46859d6391 Polishing 
Closes gh-34594
 2025-03-17 11:39:15 +01:00
Russell Bolles
573e74b8bd Refine FormHttpMessageConverter exception handling 
FormHttpMessageConverter could throw a more specific
HttpMessageNotReadableException instead of an IllegalArgumentException
when the http form data is invalid.

See gh-34594
Signed-off-by: Russell Bolles <rbolles@netflix.com>
 2025-03-17 11:37:42 +01:00
Sam Brannen
b660d8c553 Merge branch '6.2.x' 2025-03-16 16:15:24 +01:00
Sam Brannen
6c231804a0 Upgrade to Mockito 5.16.1 2025-03-16 15:33:33 +01:00
Sam Brannen
892a5cdca6 Upgrade to AspectJ 1.9.23 
This commit upgrades the build to use AspectJ 1.9.23 which provides
support for JDK 23.

Closes gh-34598
 2025-03-15 17:13:02 +01:00
Sam Brannen
37a135447c Rely on standard @Repeatable support in AnnotationJmxAttributeSource 
This commit removes the use of RepeatableContainers.of() in
AnnotationJmxAttributeSource since that is unnecessary when using the
MergedAnnotations API with @⁠Repeatable annotations such as
@⁠ManagedOperationParameter and @⁠ManagedNotification.

Closes gh-34606
 2025-03-15 16:56:56 +01:00
Sam Brannen
13efc2205b Test status quo for @⁠Repeatable annotation support in AnnotationJmxAttributeSource 2025-03-15 16:42:40 +01:00
Sam Brannen
6e1706a8a4 Polish [Annotation]JmxAttributeSource 2025-03-15 15:15:45 +01:00
Sam Brannen
f678af4626 Merge branch '6.2.x' 2025-03-15 13:51:56 +01:00
Tran Ngoc Nhan
7c3913050a Fix formatting and update links to scripting libraries and HDIV 
Closes gh-34603

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
Co-authored-by: Sam Brannen <104798+sbrannen@users.noreply.github.com>
(cherry picked from commit 666e2df0f3)
 2025-03-15 13:51:28 +01:00
Tran Ngoc Nhan
666e2df0f3 Fix formatting and update links to scripting libraries and HDIV 
Closes gh-34603

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
Co-authored-by: Sam Brannen <104798+sbrannen@users.noreply.github.com>
 2025-03-15 13:49:32 +01:00
Sam Brannen
ae13eac86b Merge branch '6.2.x' 2025-03-14 18:06:14 +01:00
Sam Brannen
ec488282a8 Upgrade to JUnit 5.12.1 2025-03-14 18:03:23 +01:00
Juergen Hoeller
d2a8b56742 Merge branch '6.2.x' 2025-03-13 18:49:30 +01:00
Juergen Hoeller
911cdb2ad0 Add resolveAutowireCandidates variant with includeNonSingletons and allowEagerInit 
Closes gh-34591
 2025-03-13 18:48:43 +01:00
Brian Clozel
4724020174 Merge branch '6.2.x' 2025-03-13 15:26:47 +01:00
Brian Clozel
0f83c483bb Remove invalid link from reference documentation 
Closes gh-34593
 2025-03-13 15:26:09 +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