fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,237 Commits 22 Branches 339 Tags
Commit Graph

687 Commits

Author SHA1 Message Date
Moritz Halbritter
0a6b723098 Merge branch '2.7.x' into 3.0.x 2023-11-08 09:53:29 +01:00
Moritz Halbritter
66ed4fe519 Remove system property dependency from MockBeanContextCachingTests 
Now this test can be run regardless of the
'spring.test.context.cache.maxSize' system property value.

See gh-38236
 2023-11-08 09:49:35 +01:00
Phillip Webb
a0b999c8b4 Merge branch '2.7.x' into 3.0.x 
Closes gh-37965
 2023-10-19 20:55:51 -07:00
Phillip Webb
abdad1cabe Constently use assertThatExceptionOf... assertions 
Closes gh-37964
 2023-10-19 20:17:26 -07:00
Andy Wilkinson
ece239f421 Merge branch '2.7.x' into 3.0.x 
Closes gh-37923
 2023-10-18 11:01:23 +01:00
Andy Wilkinson
4cc3aec587 Consider @ComponentScan in imports context cache key 
Fixes gh-31577
 2023-10-18 10:40:23 +01:00
Andy Wilkinson
b411fffb30 Merge branch '2.7.x' into 3.0.x 
Closes gh-36858
 2023-08-09 12:27:27 +01:00
Andy Wilkinson
21de3fba3c Describe quirks of JUL and Log4j2 in OutputCaptureExtension javadoc 
Closes gh-32562
 2023-08-09 12:25:26 +01:00
Andy Wilkinson
581c2633f8 Merge branch '2.7.x' into 3.0.x 
Closes gh-36229
 2023-07-05 09:09:07 +01:00
Andy Wilkinson
f4c996b432 Polish "Check for Class and ResolvableType object type attributes" 
See gh-36224
 2023-07-05 09:04:58 +01:00
Bernardo Bulgarelli
3a7185206e Check for Class and ResolvableType object type attributes 
See gh-36224
 2023-07-05 09:04:04 +01:00
Phillip Webb
ab7e4da703 Merge branch '2.7.x' into 3.0.x 
Closes gh-36208
 2023-07-04 12:18:52 +01:00
Phillip Webb
5d0640a356 Use MergedAnnotations for @AliasFor support 
Update `ImportsContextCustomizer` to use `MergedAnnotations` so
that `@AliasFor` can be supported.

See gh-34917
 2023-07-04 12:17:58 +01:00
Laurent Martelli
9baf23ccd5 Test that ImportsContextCustomizer can support @AliasFor 
Add test to ensure that `ImportsContextCustomizer` can support
`@AliasFor` annotations.

See gh-34917
 2023-07-04 12:17:58 +01:00
Andy Wilkinson
ce96cc3026 Merge branch '2.7.x' into 3.0.x 
Closes gh-35329
 2023-05-05 18:22:05 +01:00
Andy Wilkinson
6dc84b1645 Ignore non-singleton factory beans when resetting mocks 
Closes gh-35324
 2023-05-05 18:21:04 +01:00
Phillip Webb
d442bfbeff Polish 2023-04-10 16:22:11 -07:00
Phillip Webb
b6777524f7 Merge branch '2.7.x' into 3.0.x 2023-03-23 23:00:50 -07:00
Mortitz Halbritter
bece347987 Polish 2023-03-23 22:59:26 -07:00
Phillip Webb
0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb
a5902d7a00 Update copyright year of changed files 2023-02-22 18:35:17 -08:00
Phillip Webb
c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Andy Wilkinson
118f736260 Merge branch '2.7.x' into 3.0.x 
Closes gh-34044
 2023-02-01 17:32:39 +00:00
Andy Wilkinson
9940fcfe77 Reset mocks produced by FactoryBeans 
An unwanted side-effect of the changes made in c6bdd136 to fix
gh-7271 is that a mock produced by a factory bean is not reset. To
allow such a mock to be reset without regressing the fix we now call
getBean(…) as we did before c6bdd136, however the call is now
performed in a defensive manner falling back to getSingleton(…) when
it fails.

Closes gh-33830
 2023-02-01 17:22:36 +00:00
Moritz Halbritter
0a080736d8 Merge branch '2.7.x' into 3.0.x 
Closes gh-34017
 2023-01-31 10:50:30 +01:00
Johnny Lim
5eeb429e44 Polish 
See gh-33966
 2023-01-31 10:48:30 +01:00
Johnny Lim
bc7fc90550 Replace Base64Utils with JDK's Base64 
See gh-33967
 2023-01-31 10:20:06 +01:00
Krzysztof Krason
0e68cae57f Use instanceof patterns 
See gh-33987
 2023-01-26 20:36:25 -08:00
Phillip Webb
5120242996 Merge branch '2.7.x' into 3.0.x 2023-01-26 19:41:42 -08:00
Krzysztof Krason
a8958471f6 Switch anonymous inner classes to lambdas 
See gh-33987
 2023-01-26 19:34:22 -08:00
Phillip Webb
71efc55bf9 Merge branch '2.7.x' 2023-01-18 16:31:53 -08:00
Phillip Webb
7c508fa324 Update copyright year of changed files 2023-01-18 15:37:58 -08:00
Moritz Halbritter
94f4a4396c Merge branch '2.7.x' 
Closes gh-33880
 2023-01-18 17:35:52 +01:00
Moritz Halbritter
e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation 
Closes gh-33878
 2023-01-18 16:56:42 +01:00
Phillip Webb
fad88232b9 Update copyright year of changed files 2023-01-17 10:12:38 -08:00
Phillip Webb
a889c539ab Merge branch '2.7.x' 2023-01-17 10:12:25 -08:00
Phillip Webb
71ff90a6a5 Polish 2023-01-17 10:11:47 -08:00
Phillip Webb
a0fe8241a7 Update copyright year of changed files 2023-01-17 10:07:03 -08:00
Moritz Halbritter
679495a1ff Merge branch '2.7.x' 
Closes gh-33792
 2023-01-12 13:24:20 +01:00
Moritz Halbritter
d652491e20 Fix stack overflow in SpringBootMockResolver 
Closes gh-32632
 2023-01-12 13:24:09 +01:00
Moritz Halbritter
887c00e9fc Polish OutputCapture 2023-01-11 11:37:00 +01:00
Phillip Webb
a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Krzysztof Krason
cf6493f65c Simplify AssertJ assertions and also make them more readable 
See gh-33653
 2023-01-09 11:10:20 +01:00
Anugrah Singhal
3191c678c3 Remove Jetty/Netty/ApacheHttpClient checks for WebClient 
See gh-33640
 2023-01-09 10:43:44 +01:00
Phillip Webb
f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb
0254619782 Merge branch '2.7.x' 2022-12-22 00:59:40 -08:00
Phillip Webb
e4772cf3b7 Update copyright year of changed files 2022-12-22 00:59:32 -08:00
Moritz Halbritter
725337f976 Make fields final 
Closes gh-33537
 2022-12-16 14:28:44 +01:00
Moritz Halbritter
6edb6fa091 Polish "Add test for beforeEach of OutputExtension" 
See gh-33419
 2022-12-01 11:44:04 +01:00