Andy Wilkinson
3c12f39adb
Merge branch '3.1.x'
...
Closes gh-36860
1 year ago
Andy Wilkinson
30bfc34b5b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36859
1 year ago
Andy Wilkinson
b411fffb30
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36858
1 year ago
Andy Wilkinson
21de3fba3c
Describe quirks of JUL and Log4j2 in OutputCaptureExtension javadoc
...
Closes gh-32562
1 year ago
Stephane Nicoll
421448233f
Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE
...
Closes gh-36659
1 year ago
Stephane Nicoll
b46e81c230
Start building against Spring Framework 6.1.0-M4 snapshots
...
See gh-36678
1 year ago
Moritz Halbritter
ed9169501e
Polish
1 year ago
Moritz Halbritter
1a8b8ce26e
Revert "Revise synchronized blocks"
...
This reverts commit 497bbf9c2d
.
1 year ago
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
1 year ago
Andy Wilkinson
d0d545468a
Revert "Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE"
...
This reverts commit 279f8221a5
.
See gh-36659
1 year ago
Stephane Nicoll
279f8221a5
Remove invalid check for String-based FactoryBean.OBJECT_TYPE_ATTRIBUTE
...
Closes gh-36659
1 year ago
Stephane Nicoll
191ac10009
Deprecate support for OkHttp
...
Closes gh-36632
1 year ago
Johnny Lim
96c9915f12
Polish
...
See gh-36565
1 year ago
Andy Wilkinson
2de6447a79
Merge branch '3.1.x'
...
Closes gh-36232
1 year ago
Andy Wilkinson
bdb7fdc6fc
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36230
1 year ago
Andy Wilkinson
581c2633f8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36229
1 year ago
Andy Wilkinson
f4c996b432
Polish "Check for Class and ResolvableType object type attributes"
...
See gh-36224
1 year ago
Bernardo Bulgarelli
3a7185206e
Check for Class and ResolvableType object type attributes
...
See gh-36224
1 year ago
Phillip Webb
7c942679ad
Polish 'Switch ImportsContextCustomizer to use MergedAnnotations.search'
...
See gh-36211
1 year ago
Laurent Martelli
4562189125
Switch ImportsContextCustomizer to use MergedAnnotations.search #36211
...
Use `MergedAnnotations.search` in `ImportsContextCustomizer` rather than
needing dedicated search logic.
See gh-36211
1 year ago
Phillip Webb
b2985676aa
Merge branch '3.1.x'
...
Closes gh-36210
1 year ago
Phillip Webb
97ef8f38a4
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36209
1 year ago
Phillip Webb
ab7e4da703
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36208
1 year ago
Phillip Webb
5d0640a356
Use MergedAnnotations for `@AliasFor` support
...
Update `ImportsContextCustomizer` to use `MergedAnnotations` so
that `@AliasFor` can be supported.
See gh-34917
1 year ago
Laurent Martelli
9baf23ccd5
Test that ImportsContextCustomizer can support @AliasFor
...
Add test to ensure that `ImportsContextCustomizer` can support
`@AliasFor` annotations.
See gh-34917
1 year ago
Andy Wilkinson
b645eb32ac
Remove deprecated code that was to be removed in 3.2
...
Closes gh-36034
1 year ago
Andy Wilkinson
ca5bd37e81
Upgrade to Spring Framework 6.1.0-M1
...
Closes gh-35977
Closes gh-35980
1 year ago
Andy Wilkinson
fd4b7d7f7a
Merge branch '3.0.x'
...
Closes gh-35330
2 years ago
Andy Wilkinson
ce96cc3026
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35329
2 years ago
Andy Wilkinson
6dc84b1645
Ignore non-singleton factory beans when resetting mocks
...
Closes gh-35324
2 years ago
Marc Leroux
b61834c92d
Replace Mockito argument captors with assertArg
...
See gh-35015
2 years ago
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
2 years ago
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
2 years ago
Andy Wilkinson
3f93a4ece6
Polish "Add content buffering support to MockServerRestTemplateCustomizer"
...
See gh-34833
2 years ago
Chinmoy Chakraborty
b065e04be7
Add content buffering support to MockServerRestTemplateCustomizer
...
See gh-34833
2 years ago
Phillip Webb
d442bfbeff
Polish
2 years ago
Phillip Webb
b6777524f7
Merge branch '2.7.x' into 3.0.x
2 years ago
Mortitz Halbritter
bece347987
Polish
2 years ago
Phillip Webb
0b15962aca
Merge branch '2.7.x' into 3.0.x
2 years ago
Phillip Webb
a5902d7a00
Update copyright year of changed files
2 years ago
Phillip Webb
c4de86c244
Merge branch '2.7.x' into 3.0.x
2 years ago
Phillip Webb
df5898a146
Reformat code following spring-javaformat upgrade
2 years ago
Andy Wilkinson
118f736260
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34044
2 years ago
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
2 years ago
Moritz Halbritter
0a080736d8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34017
2 years ago
Johnny Lim
5eeb429e44
Polish
...
See gh-33966
2 years ago
Johnny Lim
bc7fc90550
Replace Base64Utils with JDK's Base64
...
See gh-33967
2 years ago
Krzysztof Krason
0e68cae57f
Use instanceof patterns
...
See gh-33987
2 years ago
Phillip Webb
5120242996
Merge branch '2.7.x' into 3.0.x
2 years ago
Krzysztof Krason
a8958471f6
Switch anonymous inner classes to lambdas
...
See gh-33987
2 years ago