Commit Graph

581 Commits (root-patch-5)

Author SHA1 Message Date
Phillip Webb d5d5997be7 Merge branch '2.6.x' into 2.7.x 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 770cb840c3 Use more flexible SpringFactoriesLoader
Closes gh-30235

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
3 years ago
Andy Wilkinson f35e5195ad Merge branch '2.7.x' 3 years ago
Andy Wilkinson 8782e4122c Merge branch '2.6.x' into 2.7.x
Closes gh-30848
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
Andy Wilkinson 331ec1ab21 Merge branch '2.7.x' 3 years ago
Misagh Moayyed d9ed4fbc2e Adjust mustache property name to match replacement
`spring.mustache.cache` should be replaced with
`spring.mustache.servlet.cache`, to avoid configuration warnings
on startup when using the properties migrator.

See gh-30774
3 years ago
Stephane Nicoll a4cccc98c6 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 61915aa4d5 Update copyright year of changed files
See gh-30695
3 years ago
izeye ed412af138 Polish
See gh-30695
3 years ago
dreis2211 a63e730136 Remove unused private methods
See gh-30655
3 years ago
Brian Clozel 77b7f2f1ce Switch to Spring Framework SNAPSHOTs
See gh-30624
3 years ago
Moritz Halbritter e431842668 Merge branch '2.7.x' 3 years ago
Moritz Halbritter 45f393b76b Merge branch '2.6.x' into 2.7.x
Closes gh-30437
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 5736f5401b Merge branch '2.7.x' 3 years ago
Andy Wilkinson c0a72bf5ea Merge branch '2.6.x' into 2.7.x
Closes gh-30167
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 f5ca568014 Remove versions less than 17 from JavaVersion enum
Closes gh-29503
3 years ago
Andy Wilkinson dd25696eb1 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 79fe503616 Merge branch '2.6.x' into 2.7.x
Closes gh-30044
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
Phillip Webb 5454e2e26a Merge branch '2.7.x' 3 years ago
Phillip Webb 9f00c3acf5 Polish 3 years ago
Moritz Halbritter 54f1058d63 Merge branch '2.7.x' 3 years ago
Moritz Halbritter 9149ae50da Use @AutoConfiguration for relative ordering on auto-configurations 3 years ago
Moritz Halbritter d42f675959 Merge branch '2.7.x' 3 years ago
Moritz Halbritter d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
3 years ago
Scott Frederick cb69d01e04 Merge branch '2.7.x' into main 3 years ago
Scott Frederick 42328771ad Suppress deprecation warnings for WebSecurityConfigurerAdapter
Fixes gh-29897
3 years ago
Moritz Halbritter 42808ff13c Merge branch '2.7.x'
# Conflicts:
#	spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
3 years ago
Moritz Halbritter 7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
3 years ago
Moritz Halbritter 303979fb65 Merge branch '2.7.x' 3 years ago
Moritz Halbritter 7d68b58c8f Load auto-configurations from META-INF/spring-boot
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
3 years ago
Phillip Webb ff4b92a3ba Update copyright year of changed files 3 years ago
Moritz Halbritter fdb1010cbc Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Phillip Webb a282f912e6 Organize imports
Organize imports according to updated checkstyle rules.
3 years ago
Stephane Nicoll 41fb9cf562 Merge branch '2.7.x' 3 years ago
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x
Closes gh-29613
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 e691cfdf3d Merge branch '2.7.x' 3 years ago
Stephane Nicoll 7bebfd06b8 Merge branch '2.6.x' into 2.7.x
Closes gh-29601
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
Andy Wilkinson 7b35fabf07 Upgrade to Derby 10.15.2.0
Closes gh-29509
3 years ago
Andy Wilkinson de3b9a4910 Remove code deprecated for removal in 2.x
Closes gh-29482
3 years ago
Andy Wilkinson 12cd97a20c Reinstate support for Thymeleaf 3 years ago
Phillip Webb 06398eabed Merge branch '2.7.x' 3 years ago
Phillip Webb b25e92f3e2 Merge branch '2.6.x' into 2.7.x 3 years ago
Phillip Webb 760dcffd8b Merge branch '2.7.x' 3 years ago
Phillip Webb f09bde2b60 Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 09a71e5047 Merge branch '2.7.x' 3 years ago
Stephane Nicoll b81c0047f8 Polish "Log the reason that led Devtools to restart the app"
See gh-28495
3 years ago
Artur Signell 0769b33e2e Log the reason that led Devtools to restart the app
See gh-28495
3 years ago
Brian Clozel f61c87c3a7 Revert "Merge branch '2.7.x'"
This reverts commit f0677a119c, reversing
changes made to 938d58f32c.
3 years ago
Brian Clozel f0677a119c Merge branch '2.7.x' 3 years ago
Brian Clozel ce6747ccd6 Enable GraphiQL UI by default with Devtools
GraphiQL is useful when working on a GraphQL API - it allows
developers to craft queries and test newly developed feature. This
is not enabled by default, as this should not be exposed in production
without the developer's knowledge.

This commit flips this value when Spring Boot devtools is active for a
better developer experience.

See gh-29140
3 years ago
Andy Wilkinson fe7b13ec46 Upgrade to Spring Framework 6 and Jakarta EE 9
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872

See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
3 years ago
Scott Frederick 015dca1956 Remove support for Thymeleaf
Closes gh-28611
3 years ago
Andy Wilkinson 99f33ede14 Remove SecurityManager support
Closes gh-28213
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
Andy Wilkinson c211c971f1 Polishing
Closes gh-27429
3 years ago
Andy Wilkinson 8e7a6ceb44 Polish "Make dev tools' home directory configurable"
See gh-17924
3 years ago
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
3 years ago
Stephane Nicoll dc5acb0019 Remove deprecated code flagged for removal
Closes gh-27303
3 years ago
Phillip Webb f32f4a2e3d Merge branch '2.4.x' into 2.5.x
Closes gh-27204
3 years ago
Phillip Webb 84110a22bc Don't change case of 'Sec-WebSocket-Key'
Polish commit 5ca687c9a6 had an accidental side-effect of changing
the 'Sec-WebSocket-Key' header value to lowercase. This breaks
connections since the value needs to be echoed unchanged in the
"Sec-WebSocket-Accept" header.

Fixes gh-27147
3 years ago
Phillip Webb a76e5c043e Update copyright year of changed files 3 years ago
Phillip Webb b75c79cc7c Merge branch '2.4.x' into 2.5.x
Closes gh-26919
3 years ago
Phillip Webb 5ca687c9a6 Polish 'Make livereload websocket headers case insensitive'
See gh-26813

Closes gh-26813
3 years ago
Francis Lavoie 8755512719 Make livereload websocket headers case insensitive
Update livereload `Connection` handling code so that websocket headers
are no longer case sensitive.

See gh-26813
3 years ago
Andy Wilkinson 44187bc6bf Merge branch '2.4.x' into 2.5.x
See gh-26901
3 years ago
Andy Wilkinson 7ba575d392 Prevent RestarterTests.testRestart from triggering unwanted restarts
See gh-26900
3 years ago
Andy Wilkinson 017ba504d7 Merge branch '2.4.x' into 2.5.x
Closes gh-26901
3 years ago
Andy Wilkinson 32effdba0a Try to stabilize RestarterTests.testRestart
Closes gh-26900
3 years ago
Andy Wilkinson 5de5390ef9 Merge branch '2.4.x' into 2.5.x
Closes gh-26889
3 years ago
Andy Wilkinson c89430e174 Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout
Closes gh-26888
3 years ago
Andy Wilkinson 3858c6299d Merge branch '2.4.x' into 2.5.x
Closes gh-26886
3 years ago
Andy Wilkinson 7a14a53250 Try to stabilize TunnelClientTests.addListener()
Closes gh-26885
3 years ago
Andy Wilkinson 0ab7144bf1 Merge branch '2.4.x' into 2.5.x
Closes gh-26870
3 years ago
Andy Wilkinson 608c4509f8 Try to stabilise SocketTargetServerConnectionTests
Closes gh-26857
3 years ago
Andy Wilkinson 00b9e7f498 Merge branch '2.4.x' into 2.5.x
Closes gh-26868
3 years ago
Andy Wilkinson 186658cc12 Attempt to stabilize stopTriggersTunnelClose
Closes gh-26856
3 years ago
Stephane Nicoll d3c817b7ba Polish "Remove unnecessary throws declaration in tests"
See gh-26441
4 years ago
weixsun 8a2be288a3 Remove unnecessary throws declaration in tests
See gh-26441
4 years ago
Andy Wilkinson a164658dab Merge branch '2.4.x'
Closes gh-26349
4 years ago
Andy Wilkinson cb1af35dde Merge branch '2.3.x' into 2.4.x
Closes gh-26348
4 years ago
Andy Wilkinson 6440843358 Do not wait indefinitely in initialize test if refresh fails
Closes gh-26286
4 years ago
Andy Wilkinson 048463742d Merge branch '2.4.x'
See gh-25985
4 years ago
Andy Wilkinson 06168bb130 Polish FileSystemWatcherTests
See gh-25982
4 years ago
Andy Wilkinson 91473cc326 Merge branch '2.4.x'
Closes gh-25983
4 years ago
Andy Wilkinson 638aa87d13 Merge branch '2.3.x' into 2.4.x
Closes gh-25982
4 years ago
Andy Wilkinson 02e6b7c89c Make FileSystemWatcherTests more robust
Previously, several tests in FileSystemWatcherTests assumed that all
of the changes detected by the watcher would be grouped into a single
change set. This assumption breaks down when a test runs slowly (due
to CPU or IO contention, for example), and making changes to the file
system takes long then the watcher's polling interval. When this
happens, the changes will be split across two (or more).

This commit attempts to make the tests more robust. The tests now
tolerate multiple changes sets by combining them and asserting that
across the n change sets, only the expected changes were detected.

Closes gh-25901
4 years ago
Andy Wilkinson 22b02a6c6f Merge branch '2.4.x'
Closes gh-25823
4 years ago
Andy Wilkinson a025f3d252 Merge branch '2.3.x' into 2.4.x
Closes gh-25822
4 years ago
Andy Wilkinson 896f20e1d3 Improve diagnostics of ClassPathFileSystemWatcherTests
Closes gh-25821
4 years ago
Phillip Webb 11a94ee6f0 Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson b5843cfd4d Merge branch '2.4.x' 4 years ago
Andy Wilkinson 24d729ee3b Close ClassLoader so jar it references can be deleted on Windows
Polishes 952ac7b8
4 years ago
Andy Wilkinson 29ba18afec Merge branch '2.4.x'
Closes gh-25584
Fixes gh-25367 in 2.5.x
4 years ago
Andy Wilkinson 952ac7b8d2 Don't use RestartClassLoader when proxying classes it did not load
Fixes gh-19010
Fixes gh-25367
4 years ago
Phillip Webb a1dc107144 Update copyright year of changed files 4 years ago
Madhura Bhave 29ab9fd596 Merge branch '2.4.x'
Closes gh-25351
4 years ago
Madhura Bhave b5e1787641 Make devtools securityFilterChain back-off in presence of WebSecurityConfigurerAdapter
Fixes gh-25147
4 years ago
Stephane Nicoll ca9b583c7d Merge branch '2.4.x'
Closes gh-25271
4 years ago
Stephane Nicoll 61e9d04c68 Update copyright of changes files
See gh-25266
4 years ago
izeye f48893def5 Polish 4 years ago
Stephane Nicoll 5017d59d56 Merge branch '2.4.x'
Closes gh-25184
4 years ago
Stephane Nicoll 75fc896321 Avoid Illegal reflective access warnings with devtools
This commit improves RestartClassLoader to use a method introduced in
SmartClassLoader to avoid triggering a warning on Java 11 and later.

See https://github.com/spring-projects/spring-framework/issues/26403

Closes gh-24857
4 years ago