Commit Graph

228 Commits

Author SHA1 Message Date
Andy Wilkinson c0a72bf5ea Merge branch '2.6.x' into 2.7.x
Closes gh-30167
2022-03-11 08:21:13 +00:00
Andy Wilkinson 4c1d1a6a69 Merge branch '2.5.x' into 2.6.x
Closes gh-30166
2022-03-11 08:17:59 +00:00
Andy Wilkinson cced7edd9c Document Devtools' property defaults directly in reference docs
Closes gh-29406
2022-03-11 08:15:40 +00:00
Andy Wilkinson 79fe503616 Merge branch '2.6.x' into 2.7.x
Closes gh-30044
2022-03-03 10:33:52 +00:00
Andy Wilkinson 71dd607623 Merge branch '2.5.x' into 2.6.x
Closes gh-30043
2022-03-03 10:33:40 +00:00
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
2022-03-03 10:30:54 +00:00
Phillip Webb 9f00c3acf5 Polish 2022-02-23 21:44:43 -08:00
Scott Frederick 42328771ad Suppress deprecation warnings for WebSecurityConfigurerAdapter
Fixes gh-29897
2022-02-17 19:06:13 -06:00
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x
Closes gh-29612
2022-02-01 10:59:08 +01:00
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito"
See gh-29178
2022-02-01 10:03:18 +01:00
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
2022-02-01 09:37:15 +01:00
Stephane Nicoll f1dc7e7b78 Merge branch '2.5.x' into 2.6.x
Closes gh-29600
2022-01-31 16:24:29 +01:00
Stephane Nicoll 0d78ff0657 Polish "Use a timeout when joining threads in HttpTunnelServerTests"
See gh-29522
2022-01-31 16:22:28 +01:00
Leo Li 940d969c7c Use a timeout when joining threads in HttpTunnelServerTests
See gh-29522
2022-01-31 16:01:04 +01:00
Scott Frederick 4eed637481 Merge branch '2.5.x'
Closes gh-28789
2021-11-23 12:45:46 -06:00
Scott Frederick 12244a8edd Remove use of Thymeleaf from smoke tests
Closes gh-28788
2021-11-23 12:13:05 -06:00
Leo Li 73e9c355f1 Polish
See gh-28501
2021-11-02 09:05:44 +01:00
Andy Wilkinson b9f0ec5df8 Merge branch '2.5.x'
Closes gh-28443
2021-10-22 15:48:43 +01:00
Andy Wilkinson 4d811f66ec Merge branch '2.4.x' into 2.5.x
Closes gh-28442
2021-10-22 15:48:28 +01:00
Andy Wilkinson 7607587b6c Stabilize liveReloadOnClassPathChanged()
Closes gh-28441
2021-10-22 15:47:51 +01:00
Phillip Webb 04123e0a0e Merge branch '2.5.x'
Closes gh-28377
2021-10-18 21:47:07 -07:00
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
2021-10-18 21:46:12 -07:00
Phillip Webb 55a1ec72cc Update copyright year of changed files 2021-09-21 11:25:50 -07:00
Stephane Nicoll c62a6819fe Polish "Add startup time metrics"
See gh-27878
2021-09-16 13:33:08 +02:00
bono007 2e67963bfe Add startup time metrics
See gh-27878
2021-09-16 13:19:20 +02:00
Andy Wilkinson 1bca2bbc85 Merge branch '2.5.x'
Closes gh-27511
2021-07-27 14:37:30 +01:00
Andy Wilkinson 30f63cc0cf Merge branch '2.4.x' into 2.5.x
Closes gh-27510
2021-07-27 14:37:16 +01:00
Andy Wilkinson ade922baec Stabilize LiveReloadServerTests
Closes gh-27503
2021-07-27 14:36:31 +01:00
Andy Wilkinson 3ff20ed4d9 Merge branch '2.5.x'
Closes gh-27485
2021-07-24 09:44:35 +01:00
Andy Wilkinson dead33a90a Merge branch '2.4.x' into 2.5.x
Closes gh-27484
2021-07-24 09:44:18 +01:00
Andy Wilkinson cff1827e27 Stabilize socketChannelClosedTriggersTunnelClose
Closes gh-27483
2021-07-24 09:43:41 +01:00
Andy Wilkinson c211c971f1 Polishing
Closes gh-27429
2021-07-21 11:07:15 +01:00
Andy Wilkinson 8e7a6ceb44 Polish "Make dev tools' home directory configurable"
See gh-17924
2021-07-19 17:56:34 +01:00
sfeldstein b9dbfad473 Make dev tools' home directory configurable
This allows separate projects to keep their own settings where common
settings such as spring.* or server.* don't conflict.

See gh-17924
2021-07-19 17:56:34 +01:00
Stephane Nicoll dc5acb0019 Remove deprecated code flagged for removal
Closes gh-27303
2021-07-14 11:50:01 +02:00
Phillip Webb a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Phillip Webb b75c79cc7c Merge branch '2.4.x' into 2.5.x
Closes gh-26919
2021-06-15 17:30:31 -07:00
Phillip Webb 5ca687c9a6 Polish 'Make livereload websocket headers case insensitive'
See gh-26813

Closes gh-26813
2021-06-15 17:29:45 -07:00
Andy Wilkinson 44187bc6bf Merge branch '2.4.x' into 2.5.x
See gh-26901
2021-06-15 20:01:01 +01:00
Andy Wilkinson 7ba575d392 Prevent RestarterTests.testRestart from triggering unwanted restarts
See gh-26900
2021-06-15 19:59:37 +01:00
Andy Wilkinson 017ba504d7 Merge branch '2.4.x' into 2.5.x
Closes gh-26901
2021-06-14 19:16:10 +01:00
Andy Wilkinson 32effdba0a Try to stabilize RestarterTests.testRestart
Closes gh-26900
2021-06-14 19:15:09 +01:00
Andy Wilkinson 5de5390ef9 Merge branch '2.4.x' into 2.5.x
Closes gh-26889
2021-06-14 11:05:53 +01:00
Andy Wilkinson c89430e174 Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout
Closes gh-26888
2021-06-14 11:04:23 +01:00
Andy Wilkinson 3858c6299d Merge branch '2.4.x' into 2.5.x
Closes gh-26886
2021-06-14 10:52:53 +01:00
Andy Wilkinson 7a14a53250 Try to stabilize TunnelClientTests.addListener()
Closes gh-26885
2021-06-14 10:52:12 +01:00
Andy Wilkinson 0ab7144bf1 Merge branch '2.4.x' into 2.5.x
Closes gh-26870
2021-06-11 15:55:31 +01:00
Andy Wilkinson 608c4509f8 Try to stabilise SocketTargetServerConnectionTests
Closes gh-26857
2021-06-11 15:55:01 +01:00
Andy Wilkinson 00b9e7f498 Merge branch '2.4.x' into 2.5.x
Closes gh-26868
2021-06-11 15:49:57 +01:00
Andy Wilkinson 186658cc12 Attempt to stabilize stopTriggersTunnelClose
Closes gh-26856
2021-06-11 15:48:50 +01:00