Phillip Webb
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
3 years ago
Phillip Webb
7d2f1bafc0
Update copyright year of changed files
3 years ago
Phillip Webb
99f5c781a5
Merge branch '2.5.x' into 2.6.x
3 years ago
Phillip Webb
350d27fe50
Polish code to use method references when possible
3 years ago
Andy Wilkinson
b20a8bd778
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30847
3 years ago
Andy Wilkinson
798d61fcf0
Polish "Make event handling in ClassPathFileSystemWatcherTests thread-safe"
...
See gh-30844
3 years ago
dugenkui03
aeaad006cd
Make event handling in ClassPathFileSystemWatcherTests thread-safe
...
See gh-30844
3 years ago
Moritz Halbritter
c003d5b533
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30436
3 years ago
Moritz Halbritter
0ff8119a1b
Sort entries in additional-spring-configuration metadata alphabetically
...
Closes gh-30434
3 years ago
Andy Wilkinson
4c1d1a6a69
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30166
3 years ago
Andy Wilkinson
cced7edd9c
Document Devtools' property defaults directly in reference docs
...
Closes gh-29406
3 years ago
Andy Wilkinson
71dd607623
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30043
3 years ago
Andy Wilkinson
34e436ef6e
Accommodate SocketException when reading from stopped TunnelClient
...
TunnelClientTests stopTriggersTunnelClose expects that stopping the
client will cause an attempt to read from a connected channel to
return -1. With Java 17 on Windows the connection has been reset and
a SocketException is thrown instead. This seems reasonable as
stopping the client closes the ServerSocketChannel to which the test
was connected.
This commit updates test to expect a SocketException or a return
value of -1.
Closes gh-30042
3 years ago
Stephane Nicoll
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
3 years ago
Stephane Nicoll
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
3 years ago
Yanming Zhou
b49418aaaf
Enforce use of BDDMockito
...
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule
See gh-29178
3 years ago
Stephane Nicoll
f1dc7e7b78
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29600
3 years ago
Stephane Nicoll
0d78ff0657
Polish "Use a timeout when joining threads in HttpTunnelServerTests"
...
See gh-29522
3 years ago
Leo Li
940d969c7c
Use a timeout when joining threads in HttpTunnelServerTests
...
See gh-29522
3 years ago
Scott Frederick
4eed637481
Merge branch '2.5.x'
...
Closes gh-28789
3 years ago
Scott Frederick
12244a8edd
Remove use of Thymeleaf from smoke tests
...
Closes gh-28788
3 years ago
Andy Wilkinson
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
3 years ago
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
3 years ago
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
3 years ago
Leo Li
73e9c355f1
Polish
...
See gh-28501
3 years ago
Andy Wilkinson
b9f0ec5df8
Merge branch '2.5.x'
...
Closes gh-28443
3 years ago
Andy Wilkinson
4d811f66ec
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28442
3 years ago
Andy Wilkinson
7607587b6c
Stabilize liveReloadOnClassPathChanged()
...
Closes gh-28441
3 years ago
Andy Wilkinson
14fb9c437d
Merge branch '2.5.x'
...
See gh-28377
3 years ago
Andy Wilkinson
bc2bf840b4
Fix conditions on DevToolsR2dbcAutoConfiguration
...
See gh-28345
3 years ago
Phillip Webb
04123e0a0e
Merge branch '2.5.x'
...
Closes gh-28377
3 years ago
Phillip Webb
b93a629dbe
Shutdown in-memory R2DBC databases before devtools restart
...
Add `DevToolsR2dbcAutoConfiguration` to automatically shutdown in-memory
R2DBC databases before restarting. Prior to this commit, restarts that
involved SQL initialization scripts could fail due to dirty database
content.
The `DevToolsR2dbcAutoConfiguration` class is similar in design to
`DevToolsDataSourceAutoConfiguration`, but it applies to both pooled
and non-pooled connection factories. The `DataSource` variant does not
need to deal with non-pooled connections due to the fact that
`EmbeddedDataSourceConfiguration` calls `EmbeddedDatabase.shutdown`
as a `destroyMethod`. With R2DB we don't have an `EmbeddedDatabase`
equivalent so we can always trigger a shutdown for devtools.
Fixes gh-28345
3 years ago
Leo Li
1770f065a5
Polish
...
See gh-28239
3 years ago
Andy Wilkinson
48b1175559
Merge branch '2.5.x'
...
Closes gh-28263
3 years ago
Andy Wilkinson
d47260637b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28262
3 years ago
Andy Wilkinson
c5d45585d9
Remove unnecessary overrides of finalize
...
Closes gh-28209
3 years ago
Phillip Webb
55a1ec72cc
Update copyright year of changed files
3 years ago
dreis2211
cf0fcafd13
Polish
...
See gh-27940
3 years ago
Stephane Nicoll
c62a6819fe
Polish "Add startup time metrics"
...
See gh-27878
3 years ago
bono007
2e67963bfe
Add startup time metrics
...
See gh-27878
3 years ago
Andy Wilkinson
2dfdcf5e88
Merge branch '2.5.x'
...
Closes gh-27754
3 years ago
Andy Wilkinson
0d904b8868
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27753
3 years ago
Andy Wilkinson
0b7994a679
Polish "Use 2012 for copyright beginning year"
...
See gh-27734
3 years ago
Andy Wilkinson
1bca2bbc85
Merge branch '2.5.x'
...
Closes gh-27511
3 years ago
Andy Wilkinson
30f63cc0cf
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27510
3 years ago
Andy Wilkinson
ade922baec
Stabilize LiveReloadServerTests
...
Closes gh-27503
3 years ago
Andy Wilkinson
3ff20ed4d9
Merge branch '2.5.x'
...
Closes gh-27485
3 years ago
Andy Wilkinson
dead33a90a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27484
3 years ago
Andy Wilkinson
cff1827e27
Stabilize socketChannelClosedTriggersTunnelClose
...
Closes gh-27483
3 years ago
Phillip Webb
7e9ac39f0d
Update copyright year of changed files
3 years ago