Phillip Webb
8f1a330dd5
Update copyright header of cleaned up code
...
See gh-39259
2024-01-23 10:18:50 -08:00
Tobias Lippert
def7523398
Inline redundant if statements
...
See gh-39259
2024-01-23 09:07:35 -08:00
Tobias Lippert
9cdd0c3776
Remove unnecessary semicolons
...
See gh-39259
2024-01-23 09:07:29 -08:00
Moritz Halbritter
43296d019e
Merge branch '3.2.x'
...
Closes gh-39273
2024-01-23 09:27:25 +01:00
Moritz Halbritter
46304a7821
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39272
2024-01-23 09:24:29 +01:00
Moritz Halbritter
c87d5eeb28
Ensure that remaining mocks are closed before initializing a test
...
Closes gh-39271
2024-01-23 09:17:17 +01:00
Andy Wilkinson
17e9f0cb8e
Merge branch '3.2.x'
...
Closes gh-39093
2024-01-11 11:36:38 +00:00
Andy Wilkinson
7087897507
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5
Fix Checkstyle upgrade
...
Closes gh-38746
2024-01-10 15:37:38 +00:00
Andy Wilkinson
28490738ae
Revert "Upgrade to HttpClient5 5.3"
...
This reverts commit 31f3f31ac1c2e4f3cc5a332de56ff13f05f9434a.
See gh-39007
2024-01-05 11:40:41 +00:00
Andy Wilkinson
31f3f31ac1
Upgrade to HttpClient5 5.3
...
Closes gh-39007
2024-01-04 17:32:10 +00:00
Andy Wilkinson
a1c7c0bccc
Upgrade to AssertJ 3.25.1
...
Closes gh-38997
2024-01-04 17:26:35 +00:00
Phillip Webb
246a0e6f21
Merge branch '3.1.x'
...
Closes gh-38878
2023-12-19 23:10:49 -08:00
Yanming Zhou
8cb8999772
Ban call of URLEncoder.encode/URLDecoder.decode(String,String)
...
Add ArchUnit rules to ban the use of `URLEncoder` calls with String
charsets and use `Charset` calls instead.
See gh-38740
2023-12-19 23:10:18 -08:00
Phillip Webb
5354ad15b3
Merge branch '3.1.x'
...
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou
8599e5a986
Remove unnecessary toString()
calls
...
See gh-38739
2023-12-19 22:38:34 -08:00
Yanming Zhou
84f7c2dba9
Remove unnecessary final
modifiers
...
See gh-38739
2023-12-19 22:38:14 -08:00
Moritz Halbritter
6330190913
Merge branch '3.1.x'
...
Closes gh-38728
2023-12-11 09:44:19 +01:00
Yanming Zhou
ebfbc0ef05
Cleanup kotlin sources
...
1. remove unused imports
2. remove redundant semicolon
3. remove empty class body
4. remove redundant 'constructor' keyword
5. remove redundant 'Unit' return type
6. use non-null type if possible
See gh-38708
2023-12-11 09:23:42 +01:00
Moritz Halbritter
4a851c1c90
Merge branch '3.1.x'
2023-11-08 09:53:53 +01:00
Moritz Halbritter
357c2124c4
Merge branch '3.0.x' into 3.1.x
2023-11-08 09:53:40 +01:00
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
690cfa220a
Provide a way to create custom ApplicationContextFactory
...
Update `SpringBootContextLoader` so that `getApplicationContextFactory`
is now a protected that may be overridden to provide a custom
`ApplicationContextFactory` instance.
Closes gh-38205
2023-11-07 11:53:10 -08:00
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