Andy Wilkinson
5dfa5adb75
Merge branch '2.7.x'
...
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
Phillip Webb
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
2022-05-17 22:21:10 -07:00
Phillip Webb
7d2f1bafc0
Update copyright year of changed files
2022-05-17 22:20:05 -07:00
Phillip Webb
06f8041e4d
Merge branch '2.7.x'
2022-05-17 21:50:42 -07:00
Phillip Webb
d5d5997be7
Merge branch '2.6.x' into 2.7.x
2022-05-17 21:49:20 -07:00
Phillip Webb
99f5c781a5
Merge branch '2.5.x' into 2.6.x
2022-05-17 21:48:50 -07:00
Phillip Webb
350d27fe50
Polish code to use method references when possible
2022-05-17 21:16:42 -07:00
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>
2022-05-09 14:13:04 +01:00
Andy Wilkinson
f35e5195ad
Merge branch '2.7.x'
2022-05-03 13:55:20 +01:00
Andy Wilkinson
8782e4122c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30848
2022-05-03 13:55:09 +01:00
Andy Wilkinson
b20a8bd778
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30847
2022-05-03 13:54:59 +01:00
Andy Wilkinson
798d61fcf0
Polish "Make event handling in ClassPathFileSystemWatcherTests thread-safe"
...
See gh-30844
2022-05-03 13:54:13 +01:00
dugenkui03
aeaad006cd
Make event handling in ClassPathFileSystemWatcherTests thread-safe
...
See gh-30844
2022-05-03 13:52:55 +01:00
Andy Wilkinson
331ec1ab21
Merge branch '2.7.x'
2022-04-25 13:02:34 +01:00
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
2022-04-25 12:42:38 +01:00
Stephane Nicoll
a4cccc98c6
Merge branch '2.7.x'
2022-04-19 09:37:08 +02:00
Stephane Nicoll
61915aa4d5
Update copyright year of changed files
...
See gh-30695
2022-04-19 09:36:38 +02:00
izeye
ed412af138
Polish
...
See gh-30695
2022-04-19 09:34:28 +02:00
dreis2211
a63e730136
Remove unused private methods
...
See gh-30655
2022-04-19 08:45:44 +02:00
Brian Clozel
77b7f2f1ce
Switch to Spring Framework SNAPSHOTs
...
See gh-30624
2022-04-12 17:02:03 +02:00
Moritz Halbritter
e431842668
Merge branch '2.7.x'
2022-03-25 14:56:49 +01:00
Moritz Halbritter
45f393b76b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30437
2022-03-25 14:56:01 +01:00
Moritz Halbritter
c003d5b533
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30436
2022-03-25 14:55:31 +01:00
Moritz Halbritter
0ff8119a1b
Sort entries in additional-spring-configuration metadata alphabetically
...
Closes gh-30434
2022-03-25 14:54:39 +01:00
Andy Wilkinson
5736f5401b
Merge branch '2.7.x'
2022-03-11 08:23:27 +00:00
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
f5ca568014
Remove versions less than 17 from JavaVersion enum
...
Closes gh-29503
2022-03-09 15:16:59 +00:00
Andy Wilkinson
dd25696eb1
Merge branch '2.7.x'
2022-03-03 10:34:08 +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
5454e2e26a
Merge branch '2.7.x'
2022-02-23 23:02:59 -08:00
Phillip Webb
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
Moritz Halbritter
54f1058d63
Merge branch '2.7.x'
2022-02-23 16:10:49 +01:00
Moritz Halbritter
9149ae50da
Use @AutoConfiguration for relative ordering on auto-configurations
2022-02-23 15:39:46 +01:00
Moritz Halbritter
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
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
2022-02-21 10:34:38 +01:00
Scott Frederick
cb69d01e04
Merge branch '2.7.x' into main
2022-02-17 19:07:24 -06:00
Scott Frederick
42328771ad
Suppress deprecation warnings for WebSecurityConfigurerAdapter
...
Fixes gh-29897
2022-02-17 19:06:13 -06:00
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
2022-02-17 10:56:23 +01:00
Moritz Halbritter
7c96294641
Move our auto-configurations from spring.factories to new file
...
Closes gh-29873
2022-02-17 10:18:46 +01:00
Moritz Halbritter
303979fb65
Merge branch '2.7.x'
2022-02-17 09:17:35 +01:00
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
2022-02-17 09:17:23 +01:00
Phillip Webb
ff4b92a3ba
Update copyright year of changed files
2022-02-16 20:44:54 -08:00
Moritz Halbritter
fdb1010cbc
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 15:48:27 +01:00
Moritz Halbritter
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 13:55:16 +01:00
