Phillip Webb
7377d85096
Merge branch '2.7.x'
...
Closes gh-31866
2022-07-26 12:18:14 +01:00
Phillip Webb
a4ef6a7c5c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31865
2022-07-26 12:13:16 +01:00
Phillip Webb
f8412847dc
Update copyright year for "Fix typos in code and documentation"
...
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel
dbfc6bded4
Fix typos in code and documentation
...
See gh-31734
2022-07-26 12:08:07 +01:00
Andy Wilkinson
3405a54f9e
Exclude Jetty toolchain dependencies in favor of official API artifacts
...
Closes gh-31720
2022-07-14 13:55:26 +01:00
Oliver Drotbohm
b10c57551c
Upgrade to Hibernate 6.1.1.Final
...
This commit makes the following potentially breaking changes:
- Dependency management for modules that do not exist in Hibernate
6.1 has been removed.
- Hibernate's modules are now in the org.hibernate.orm group. Users
not using the starter or using modules that are not in the starter
will have to update their build configuration accordingly.
- spring.jpa.hibernate.use-new-id-generator-mappings has been removed
as Hibernate no longer supports switching back to the old ID
generator mappings.
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
Closes gh-31674
2022-07-12 09:36:34 +01:00
dreis2211
cc91009b70
Use java.util.HexFormat where appropriate
...
See gh-31477
2022-06-21 17:02:39 +01:00
dreis2211
f2101684b7
Use pattern matching for instanceof where appropriate
...
Closes gh-28181
2022-06-20 18:35:32 +01:00
dreis2211
5db04da275
Use pattern matching for instanceof where appropriate
...
See gh-31475
2022-06-20 17:55:36 +01:00
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
Phillip Webb
a282f912e6
Organize imports
...
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
Stephane Nicoll
41fb9cf562
Merge branch '2.7.x'
2022-02-01 11:15:49 +01:00
Stephane Nicoll
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01: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
e691cfdf3d
Merge branch '2.7.x'
2022-01-31 16:24:52 +01:00
Stephane Nicoll
7bebfd06b8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29601
2022-01-31 16:24:40 +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
Andy Wilkinson
7b35fabf07
Upgrade to Derby 10.15.2.0
...
Closes gh-29509
2022-01-20 17:37:01 +00:00
Andy Wilkinson
de3b9a4910
Remove code deprecated for removal in 2.x
...
Closes gh-29482
2022-01-19 17:25:14 +00:00
Andy Wilkinson
12cd97a20c
Reinstate support for Thymeleaf
2022-01-18 16:01:29 +00:00
Phillip Webb
06398eabed
Merge branch '2.7.x'
2022-01-04 12:26:24 -08:00
Phillip Webb
b25e92f3e2
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:24:34 -08:00
Phillip Webb
760dcffd8b
Merge branch '2.7.x'
2022-01-04 12:22:54 -08:00
Phillip Webb
f09bde2b60
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:20:31 -08:00
Stephane Nicoll
09a71e5047
Merge branch '2.7.x'
2022-01-03 14:50:36 +01:00
Stephane Nicoll
b81c0047f8
Polish "Log the reason that led Devtools to restart the app"
...
See gh-28495
2022-01-03 14:48:39 +01:00
Artur Signell
0769b33e2e
Log the reason that led Devtools to restart the app
...
See gh-28495
2022-01-03 14:25:12 +01:00
Brian Clozel
f61c87c3a7
Revert "Merge branch '2.7.x'"
...
This reverts commit f0677a119c
, reversing
changes made to 938d58f32c
.
2021-12-21 09:05:06 +01:00
Brian Clozel
f0677a119c
Merge branch '2.7.x'
2021-12-21 09:04:10 +01:00
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
2021-12-21 08:33:31 +01:00
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
2021-11-30 20:32:16 +00:00
Scott Frederick
015dca1956
Remove support for Thymeleaf
...
Closes gh-28611
2021-11-30 15:55:47 +00:00
Andy Wilkinson
99f33ede14
Remove SecurityManager support
...
Closes gh-28213
2021-11-30 15:37:15 +00: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
Andy Wilkinson
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00: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
Andy Wilkinson
14fb9c437d
Merge branch '2.5.x'
...
See gh-28377
2021-10-19 11:03:51 +01:00
Andy Wilkinson
bc2bf840b4
Fix conditions on DevToolsR2dbcAutoConfiguration
...
See gh-28345
2021-10-19 11:03:20 +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
Leo Li
1770f065a5
Polish
...
See gh-28239
2021-10-13 09:07:33 +02:00