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

716 Commits

Author SHA1 Message Date
Phillip Webb
d638bbb0ba Merge branch '3.1.x' 
Closes gh-37967
 2023-10-19 21:25:44 -07:00
Phillip Webb
1d456e09d2 Merge branch '3.0.x' into 3.1.x 
Closes gh-37966
 2023-10-19 21:12:52 -07: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
029c28d923 Merge branch '3.1.x' 
Closes gh-37925
 2023-10-18 11:30:35 +01:00
Andy Wilkinson
8f18b116de Merge branch '3.0.x' into 3.1.x 
Closes gh-37924
 2023-10-18 11:17:41 +01: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
Scott Frederick
ff99de49c4 Configure a RestClient.Builder with RestClientTest 
This commit adds support for configuring a `RestClient.Builder` and
`MockRestServiceServer` support for the `RestClient` when using
`@RestClientTest` sliced tests.

Closes gh-37033
 2023-09-29 15:07:38 -05:00
Phillip Webb
8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07:00
Andy Wilkinson
3c12f39adb Merge branch '3.1.x' 
Closes gh-36860
 2023-08-09 12:27:50 +01:00
Andy Wilkinson
30bfc34b5b Merge branch '3.0.x' into 3.1.x 
Closes gh-36859
 2023-08-09 12:27:41 +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
Stephane Nicoll
421448233f Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE 
Closes gh-36659
 2023-08-09 11:18:25 +02:00
Stephane Nicoll
b46e81c230 Start building against Spring Framework 6.1.0-M4 snapshots 
See gh-36678
 2023-08-09 11:18:25 +02:00
Moritz Halbritter
ed9169501e Polish 2023-08-08 13:12:47 +02:00
Moritz Halbritter
1a8b8ce26e Revert "Revise synchronized blocks" 
This reverts commit 497bbf9c2d0fafa49e5e9e2688fcc8000d9f5675.
 2023-08-03 17:26:31 +02:00
Moritz Halbritter
497bbf9c2d Revise synchronized blocks 
- Replace synchronized with Lock when guarding long-running operations
- Remove unnecessary synchronization in FileSystemWatcher
- Replace HashMap with ConcurrentHashMap in Restarter
- Remove unnecessary locking on AtomicBoolean in
  SpringApplicationBuilder
- Remove unnecessary locking in SimpleFormatter

Closes gh-36670
 2023-08-03 09:23:46 +02:00
Andy Wilkinson
d0d545468a Revert "Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE" 
This reverts commit 279f8221a558694e3b2a20b5c91a817a0be2d7a0.

See gh-36659
 2023-08-01 17:57:34 +01:00
Stephane Nicoll
279f8221a5 Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE 
Closes gh-36659
 2023-08-01 16:50:56 +02:00
Stephane Nicoll
191ac10009 Deprecate support for OkHttp 
Closes gh-36632
 2023-08-01 16:45:13 +02:00
Johnny Lim
96c9915f12 Polish 
See gh-36565
 2023-07-26 10:00:56 +02:00
Andy Wilkinson
2de6447a79 Merge branch '3.1.x' 
Closes gh-36232
 2023-07-05 09:09:39 +01:00
Andy Wilkinson
bdb7fdc6fc Merge branch '3.0.x' into 3.1.x 
Closes gh-36230
 2023-07-05 09:09: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
7c942679ad Polish 'Switch ImportsContextCustomizer to use MergedAnnotations.search' 
See gh-36211
 2023-07-04 14:05:48 +01:00
Laurent Martelli
4562189125 Switch ImportsContextCustomizer to use MergedAnnotations.search #36211 
Use `MergedAnnotations.search` in `ImportsContextCustomizer` rather than
needing dedicated search logic.

See gh-36211
 2023-07-04 13:58:53 +01:00
Phillip Webb
b2985676aa Merge branch '3.1.x' 
Closes gh-36210
 2023-07-04 12:19:47 +01:00
Phillip Webb
97ef8f38a4 Merge branch '3.0.x' into 3.1.x 
Closes gh-36209
 2023-07-04 12:19:20 +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
b645eb32ac Remove deprecated code that was to be removed in 3.2 
Closes gh-36034
 2023-06-23 18:14:22 +01:00
Andy Wilkinson
ca5bd37e81 Upgrade to Spring Framework 6.1.0-M1 
Closes gh-35977
Closes gh-35980
 2023-06-19 18:12:16 +01:00
Andy Wilkinson
fd4b7d7f7a Merge branch '3.0.x' 
Closes gh-35330
 2023-05-05 18:22:20 +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
Marc Leroux
b61834c92d Replace Mockito argument captors with assertArg 
See gh-35015
 2023-05-05 11:34:55 +02:00
Phillip Webb
2b261e6ebd Apply TestTypeExcludeFilter in regular applications 
Add `ExcludeFilterApplicationContextInitializer` to register the
`TestTypeExcludeFilter` for regular applications.

Prior to this commit, the filter was only registered using the
`ExcludeFilterContextCustomizerFactory` which meant that test components
were filtered in tests but not when using `SpringApplication.from` with
a test classpath.

Fixes gh-35206
 2023-04-29 21:10:02 -07:00
Andy Wilkinson
a37a7228b8 Merge pull request #34833 from chinmoy12c 
* gh-34833:
  Polish "Add content buffering support to MockServerRestTemplateCustomizer"
  Add content buffering support to MockServerRestTemplateCustomizer

Closes gh-34833
 2023-04-17 18:05:29 +01:00
Andy Wilkinson
3f93a4ece6 Polish "Add content buffering support to MockServerRestTemplateCustomizer" 
See gh-34833
 2023-04-17 18:03:44 +01:00
Chinmoy Chakraborty
b065e04be7 Add content buffering support to MockServerRestTemplateCustomizer 
See gh-34833
 2023-04-17 18:02:53 +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