5736f5401b
Merge branch '2.7.x'
2022-03-11 08:23:27 +00:00
c0a72bf5ea
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30167
2022-03-11 08:21:13 +00:00
4c1d1a6a69
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30166
2022-03-11 08:17:59 +00:00
cced7edd9c
Document Devtools' property defaults directly in reference docs
...
Closes gh-29406
2022-03-11 08:15:40 +00:00
f5ca568014
Remove versions less than 17 from JavaVersion enum
...
Closes gh-29503
2022-03-09 15:16:59 +00:00
dd25696eb1
Merge branch '2.7.x'
2022-03-03 10:34:08 +00:00
79fe503616
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30044
2022-03-03 10:33:52 +00:00
71dd607623
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30043
2022-03-03 10:33:40 +00:00
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
5454e2e26a
Merge branch '2.7.x'
2022-02-23 23:02:59 -08:00
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
54f1058d63
Merge branch '2.7.x'
2022-02-23 16:10:49 +01:00
9149ae50da
Use @AutoConfiguration for relative ordering on auto-configurations
2022-02-23 15:39:46 +01:00
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
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
cb69d01e04
Merge branch '2.7.x' into main
2022-02-17 19:07:24 -06:00
42328771ad
Suppress deprecation warnings for WebSecurityConfigurerAdapter
...
Fixes gh-29897
2022-02-17 19:06:13 -06:00
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
7c96294641
Move our auto-configurations from spring.factories to new file
...
Closes gh-29873
2022-02-17 10:18:46 +01:00
303979fb65
Merge branch '2.7.x'
2022-02-17 09:17:35 +01:00
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
ff4b92a3ba
Update copyright year of changed files
2022-02-16 20:44:54 -08:00
fdb1010cbc
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 15:48:27 +01:00
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 13:55:16 +01:00
a282f912e6
Organize imports
...
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
41fb9cf562
Merge branch '2.7.x'
2022-02-01 11:15:49 +01:00
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01:00
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
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
e691cfdf3d
Merge branch '2.7.x'
2022-01-31 16:24:52 +01:00
7bebfd06b8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29601
2022-01-31 16:24:40 +01:00
f1dc7e7b78
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29600
2022-01-31 16:24:29 +01:00
0d78ff0657
Polish "Use a timeout when joining threads in HttpTunnelServerTests"
...
See gh-29522
2022-01-31 16:22:28 +01:00
940d969c7c
Use a timeout when joining threads in HttpTunnelServerTests
...
See gh-29522
2022-01-31 16:01:04 +01:00
7b35fabf07
Upgrade to Derby 10.15.2.0
...
Closes gh-29509
2022-01-20 17:37:01 +00:00
de3b9a4910
Remove code deprecated for removal in 2.x
...
Closes gh-29482
2022-01-19 17:25:14 +00:00
12cd97a20c
Reinstate support for Thymeleaf
2022-01-18 16:01:29 +00:00
06398eabed
Merge branch '2.7.x'
2022-01-04 12:26:24 -08:00
b25e92f3e2
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:24:34 -08:00
760dcffd8b
Merge branch '2.7.x'
2022-01-04 12:22:54 -08:00
f09bde2b60
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:20:31 -08:00
09a71e5047
Merge branch '2.7.x'
2022-01-03 14:50:36 +01:00
b81c0047f8
Polish "Log the reason that led Devtools to restart the app"
...
See gh-28495
2022-01-03 14:48:39 +01:00
0769b33e2e
Log the reason that led Devtools to restart the app
...
See gh-28495
2022-01-03 14:25:12 +01:00
f61c87c3a7
Revert "Merge branch '2.7.x'"
...
This reverts commit f0677a119c938d58f32c
2021-12-21 09:05:06 +01:00
f0677a119c
Merge branch '2.7.x'
2021-12-21 09:04:10 +01:00
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
2021-12-21 08:33:31 +01:00
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
2021-11-30 20:32:16 +00:00
015dca1956
Remove support for Thymeleaf
...
Closes gh-28611
2021-11-30 15:55:47 +00:00
Andy Wilkinson
Phillip Webb
Moritz Halbritter
Scott Frederick
Stephane Nicoll
Yanming Zhou
Leo Li
Artur Signell
Brian Clozel