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

810 Commits

Author SHA1 Message Date
Andy Wilkinson
1b6b9efcb2 Reinstate init of Mockito mocks in test execution listener 
Closes gh-42708
 2024-10-16 10:22:31 +01:00
Stéphane Nicoll
2728344ccb Disable test temporarily 
See https://github.com/spring-projects/spring-framework/issues/33690
 2024-10-14 14:38:17 +02:00
Andy Wilkinson
31fada6d3e Start building against Spring Framework 6.2.0 snapshots 
See gh-42562
 2024-10-09 19:13:04 +01:00
Phillip Webb
7b3077280c Merge branch '3.3.x' 
Closes gh-42441
 2024-09-24 14:32:48 -07:00
Phillip Webb
100bedc07d Merge branch '3.2.x' into 3.3.x 
Closes gh-42440
 2024-09-24 14:29:09 -07:00
Phillip Webb
ad72411e2b Apply conventions plugin to all subprojects 
Closes gh-42438
 2024-09-24 14:26:32 -07:00
Phillip Webb
72f379a5b2 Merge branch '3.2.x' into 3.3.x 
Closes gh-42434
 2024-09-24 13:01:05 -07:00
Phillip Webb
eafe61c4ca Backport upgrade to Gradle 8.10.1 
Cherry-pick commits d756bf4e86, 083ac67d13 and 162c929a80 to
upgrade to Gradle 8.10.1.

Closes gh-42433
 2024-09-24 12:55:29 -07:00
Phillip Webb
f5b6514bef Allow additional context interfaces to be defined for testing 
Update `AssertableApplicationContext` and `ApplicationContextRunner`
implementations to support additional `ApplicationContext` interfaces.

Closes gh-42369
 2024-09-18 23:47:13 -07:00
Andy Wilkinson
d756bf4e86 Upgrade build to Gradle 8.10 
Closes gh-41980
 2024-08-23 12:41:05 +01:00
Phillip Webb
f1987e6f8b Update copyright year of changed files 2024-08-19 16:45:34 -07:00
Moritz Halbritter
46150bae89 Merge branch '3.3.x' 
Closes gh-41858
 2024-08-14 17:20:59 +02:00
Moritz Halbritter
1d45016d8c Upgrade to spring-javaformat 0.0.43 
Closes gh-41853
 2024-08-14 16:32:41 +02:00
Scott Frederick
cc3e62deaf Merge branch '3.3.x' 
Closes gh-41850
 2024-08-13 16:02:58 -05:00
Scott Frederick
cae3a6a3e2 Merge branch '3.2.x' into 3.3.x 
Closes gh-41849
 2024-08-13 16:02:48 -05:00
Scott Frederick
b43d97b359 Document the need to explicitly reset mock servers 
When MockServerRestTemplateCustomizer and MockServerRestClientCustomizer
are used directly instead of via auto-configuration, it is necessary to
manually reset the MockRestServiceServer expectations between tests.

Closes gh-41848
 2024-08-13 16:01:46 -05:00
Moritz Halbritter
f4b4f4f0bf Make PID and application version available in the environment 
Adds the following new properties:

- spring.application.pid
- spring.application.version

Refactors the ResourceBanner and the structured logging support to use
the new properties.

Closes gh-41604
 2024-08-01 15:03:41 +02:00
Andy Wilkinson
e201b94d4f Merge branch '3.3.x' 
Closes gh-41616
 2024-07-25 16:17:52 +01:00
Andy Wilkinson
c642f6d268 Merge branch '3.2.x' into 3.3.x 
Closes gh-41613
 2024-07-25 16:16:35 +01:00
Andy Wilkinson
5f666eec5b Reduce warnings reported by Eclipse 
Closes gh-41598
 2024-07-25 14:55:00 +01:00
Phillip Webb
000600c68a Merge branch '3.3.x' 2024-07-22 18:41:53 +01:00
Stéphane Nicoll
2975a8ce3f Fix javadoc warning 
The `@deprecated` tag cannot be used on module-info. This commit adapts
the deprecation notice accordingly.

Closes gh-41481
 2024-07-14 11:33:46 +02:00
Andy Wilkinson
cddf92e047 Polish "Deprecate @MockBean and @SpyBean" 
See gh-39864
 2024-07-12 13:49:11 +01:00
Jakob Wanger
24763940a0 Deprecate @MockBean and @SpyBean 
- Deprecate Deprecate @MockBean and @SpyBean in favor of Spring
  Framework 6.2's @MockitoBean and @MockitoSpy
- Migrate usages of @MockBean and @SpyBean to @MockitoBean and
  @MockitoSpy

Signed-off-by: Jakob Wanger <jakobwanger@gmail.com>

See gh-39864
 2024-07-12 12:18:01 +01:00
Stéphane Nicoll
156237227c Migrate MockMvc tests to MockMvcTester 
See gh-41198
 2024-07-03 15:09:10 +02:00
Phillip Webb
d411d4347f Merge branch '3.3.x' 
Closes gh-41222
 2024-06-24 12:24:40 -07:00
Phillip Webb
726f71a1a8 Merge branch '3.2.x' into 3.3.x 
Closes gh-41221
 2024-06-24 12:24:27 -07:00
Phillip Webb
57f452fec1 Disable ReactorResourceFactory use of global resources in tests 
Add `ContextCustomizerFactory` to automatically disable the use of
`ReactorResourceFactory` global resources in tests.

Fixes gh-38199
 2024-06-24 11:22:11 -07:00
Andy Wilkinson
b593734edd Merge branch '3.2.x' into 3.3.x 
Closes gh-41191
 2024-06-21 10:01:22 +01:00
Stéphane Nicoll
17ca0421e7 Upgrade to HtmlUnit 4.2.0 and Selenium HtmlUnit 4.20 
Closes gh-41178
Closes gh-41179
 2024-06-20 20:18:23 +01:00
Stéphane Nicoll
305bfb1641 Adapt to Mockito support in the Test Context Framework 
This commit updates MockitoTestExecutionListener to not handle mocks
as this is already done in the listener provided by the core framework,
and registration can only happen once.

Integration tests have been left as-is to validate that the presence
of both listeners doesn't have an unwanted side effect.

See gh-41177
 2024-06-20 20:18:07 +01:00
Stéphane Nicoll
2053e13c09 Adapt to new Placeholder resolution API 
See gh-41177
 2024-06-20 20:18:07 +01:00
Andy Wilkinson
6110e0ff43 Merge branch '3.2.x' 
Closes gh-41184
 2024-06-20 19:30:12 +01:00
Stéphane Nicoll
e9eeac9028 Use Spring Framework's NoOpResponseErrorHandler 
See spring-projects/spring-framework#32750

Closes gh-41183
 2024-06-20 18:28:36 +01:00
Phillip Webb
9dda006a18 Merge branch '3.2.x' 2024-06-19 22:55:00 -07:00
Phillip Webb
2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07:00
Phillip Webb
147240aa0c Merge branch '3.2.x' 
Closes gh-41080
 2024-06-11 13:32:30 -07:00
Phillip Webb
bcbcafaab2 Polish "Use method references when possible in test code" 
See gh-40974
 2024-06-11 12:58:04 -07:00
Ahmed Ashour
207327d97c Use method references when possible in test code 
See gh-40974
 2024-06-11 12:58:00 -07:00
Phillip Webb
255bcc28e6 Merge branch '3.2.x' 
Closes gh-41077
 2024-06-11 10:48:52 -07:00
Piyal Ahmed
17adcfc180 Use constructor rather than Collection.addAll 
See gh-41053
 2024-06-11 09:39:45 -07:00
Moritz Halbritter
000869c25d Merge branch '3.2.x' 
Closes gh-41065
 2024-06-11 15:01:29 +02:00
Donghoon Lee
8920c2f269 Fix typo in javadoc 
See gh-41052
 2024-06-11 15:01:06 +02:00
Andy Wilkinson
f355080dc8 Merge branch '3.2.x' 
Closes gh-40855
 2024-05-21 15:48:15 +01:00
Andy Wilkinson
486ceecc9a Use the bean factory to get the type produced by a factory bean 
Previously, we only looked at the OBJECT_TYPE_ATTRIBUTE on the
factory bean's definition. This did not work for situations
where the information's provided by the definition's target type
rather than the attribute.

Rather than manually considering the target type in addition to
the existing consideration of the attribute, we now ask the bean
factory for the type that will be produced by the factory bean
instead. This should insulate us from any changes and
enhancements in Framework in the future.

Fixes gh-40234
 2024-05-21 15:27:59 +01:00
Moritz Halbritter
6697db257c Merge branch '3.2.x' 
Closes gh-40614
 2024-05-02 11:56:21 +02:00
Moritz Halbritter
2183b47e62 Merge branch '3.1.x' into 3.2.x 
Closes gh-40612
 2024-05-02 11:53:21 +02:00
Moritz Halbritter
1534bc8ad2 Polish "Avoid using OkHttp3ClientHttpRequestFactory in test" 
See gh-40611
 2024-05-02 11:45:23 +02:00
Stéphane Nicoll
20042576e9 Avoid using OkHttp3ClientHttpRequestFactory in test 
See gh-40611
 2024-05-02 11:45:20 +02:00
Phillip Webb
6963bd884b Merge branch '3.2.x' 2024-04-18 12:53:26 -07:00