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