fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,722 Commits 22 Branches 339 Tags
Commit Graph

13654 Commits

Author SHA1 Message Date
Andy Wilkinson
7cd2d6474c Only check database's type when there are scripts to apply 
Fixes gh-26925
 2021-06-17 09:55:33 +01:00
Phillip Webb
5c65b1bcde Fix asciidoctor anchor references 
See gh-26939
 2021-06-16 23:42:29 -07:00
Phillip Webb
c3b873c11d Merge branch '2.4.x' into 2.5.x 
Closes gh-26939
 2021-06-16 22:43:13 -07:00
Phillip Webb
b5c92d5174 Allow indirect standard profile-specific imports 
Effectively revert commit d1b256a16936 so that profile-specific imports
can again be used with or without a parent import.

Fixes gh-26858
 2021-06-16 22:30:29 -07:00
Scott Frederick
79f47b150a Merge branch '2.4.x' into 2.5.x 
Closes gh-26935
 2021-06-16 15:59:38 -05:00
Scott Frederick
5147fcacdf Improve BeanNotOfRequiredTypeFailureAnalyzer output 
This commit modifies the output of BeanNotOfRequiredTypeFailureAnalyzer
to include type information for both the actual and the required types
and to remove ambiguity.

Fixes gh-26821
 2021-06-16 14:44:11 -05:00
Andy Wilkinson
bc7004d9c6 Fix WebSocket support with Jetty 10.0.x 
Fixes gh-26847
 2021-06-16 12:38:33 +01:00
Andy Wilkinson
d635e1e779 Merge branch '2.4.x' into 2.5.x 
Closes gh-26923
 2021-06-16 08:28:05 +01:00
Andy Wilkinson
fe078c8afc Avoid capturing URI template when interceptor won't use it 
Previously, the URI template handler installed by the client metrics
interceptor would always capture the URI template and push it onto the
deque, irrespective of whether auto timing was enabled. When
auto-timing is disabled the deque is never polled so this led to its
unrestricted growth.

This commit updates the URI template handler so that a URI template is
only pushed onto the deque when the auto timing configuration enables
the interceptor.

Fixes gh-26915
 2021-06-16 08:27:51 +01:00
Phillip Webb
b75c79cc7c Merge branch '2.4.x' into 2.5.x 
Closes gh-26919
 2021-06-15 17:30:31 -07:00
Phillip Webb
5ca687c9a6 Polish 'Make livereload websocket headers case insensitive' 
See gh-26813

Closes gh-26813
 2021-06-15 17:29:45 -07:00
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
 2021-06-15 16:50:34 -07:00
Andy Wilkinson
2c2ab69315 Merge branch '2.4.x' into 2.5.x 
Closes gh-26917
 2021-06-15 22:20:52 +01:00
Andy Wilkinson
a1e279f736 Make Flyway and Liquibase auto-config back off without spring-jdbc 
The auto-config requires Spring JDBC for DataSource creation from
spring.flyway.url or spring.liquibase.url, checking Flyway migrations
exist, etc. Without it, the application fails to start due to missing
spring-jdbc classes.

This commit updates the auto-config so that it backs off in the
absence of spring-jdbc.

Closes gh-26849
 2021-06-15 22:00:11 +01:00
Andy Wilkinson
44187bc6bf Merge branch '2.4.x' into 2.5.x 
See gh-26901
 2021-06-15 20:01:01 +01:00
Andy Wilkinson
7ba575d392 Prevent RestarterTests.testRestart from triggering unwanted restarts 
See gh-26900
 2021-06-15 19:59:37 +01:00
Stephane Nicoll
96029dbd8a Polish "Add Azure info to the cloud deployment docs" 
See gh-26910
 2021-06-15 08:35:56 +02:00
Andy Clement
8321faaf16 Add Azure info to the cloud deployment docs 
See gh-26910
 2021-06-15 08:34:29 +02:00
izeye
eeefaf4314 Fix Javadoc deprecated since 
See gh-26907
 2021-06-15 08:23:13 +02:00
Andy Wilkinson
6a51c272b9 Test our Gradle plugin against Gradle 7.1 
Closes gh-26904
 2021-06-14 21:01:06 +01:00
Andy Wilkinson
017ba504d7 Merge branch '2.4.x' into 2.5.x 
Closes gh-26901
 2021-06-14 19:16:10 +01:00
Andy Wilkinson
32effdba0a Try to stabilize RestarterTests.testRestart 
Closes gh-26900
 2021-06-14 19:15:09 +01:00
Madhura Bhave
aa873d3a22 Reorder documentation overview section 
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
 2021-06-14 10:48:49 -07:00
Andy Wilkinson
9e2339b5d0 Merge branch '2.4.x' into 2.5.x 2021-06-14 13:36:29 +01:00
Andy Wilkinson
16bfa669e1 Polish authors separators 2021-06-14 13:35:30 +01:00
Andy Wilkinson
5f26fd9ccb Merge branch '2.4.x' into 2.5.x 
Closes gh-26891
 2021-06-14 13:28:54 +01:00
Andy Wilkinson
f6b7730dac Use Asciidoctor's revision line to provide document's version 
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.

Closes gh-26851
 2021-06-14 13:24:01 +01:00
Andy Wilkinson
5de5390ef9 Merge branch '2.4.x' into 2.5.x 
Closes gh-26889
 2021-06-14 11:05:53 +01:00
Andy Wilkinson
c89430e174 Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout 
Closes gh-26888
 2021-06-14 11:04:23 +01:00
Andy Wilkinson
3858c6299d Merge branch '2.4.x' into 2.5.x 
Closes gh-26886
 2021-06-14 10:52:53 +01:00
Andy Wilkinson
7a14a53250 Try to stabilize TunnelClientTests.addListener() 
Closes gh-26885
 2021-06-14 10:52:12 +01:00
Andy Wilkinson
866f1e34c1 Merge branch '2.4.x' into 2.5.x 
Closes gh-26873
 2021-06-11 19:53:05 +01:00
Andy Wilkinson
37d395bad2 Try to stabilize flaky MetricsWebClientFilterFunction test 
Closes gh-26855
 2021-06-11 19:48:34 +01:00
Andy Wilkinson
0ab7144bf1 Merge branch '2.4.x' into 2.5.x 
Closes gh-26870
 2021-06-11 15:55:31 +01:00
Andy Wilkinson
608c4509f8 Try to stabilise SocketTargetServerConnectionTests 
Closes gh-26857
 2021-06-11 15:55:01 +01:00
Andy Wilkinson
00b9e7f498 Merge branch '2.4.x' into 2.5.x 
Closes gh-26868
 2021-06-11 15:49:57 +01:00
Andy Wilkinson
186658cc12 Attempt to stabilize stopTriggersTunnelClose 
Closes gh-26856
 2021-06-11 15:48:50 +01:00
Andy Wilkinson
f3f119b111 Don't shutdown logging system before contexts 
Add `SpringApplicationShutdownHook` to manage orderly application
shutdown, specifically around the `LoggingSystem`. `SpringApplication`
now offers a `getShutdownHandlers()` method that can be used to add
handlers that are guaranteed to only run after the `ApplicationContext`
has been closed and is inactive.

Fixes gh-26660
 2021-06-10 07:56:48 -07:00
Andy Wilkinson
39aa27e13c Make DB init back off without DatabasePopulator 
Fixes gh-26850
 2021-06-10 11:27:25 +01:00
Phillip Webb
2835085ffb Polish 2021-06-10 00:21:38 -07:00
Phillip Webb
17671980dc Merge branch '2.4.x' 2021-06-10 00:15:48 -07:00
Phillip Webb
7c4f178c17 Merge branch '2.3.x' into 2.4.x 2021-06-10 00:15:28 -07:00
Phillip Webb
3b48526732 Polish 2021-06-10 00:12:34 -07:00
Stephane Nicoll
18eb88b281 Upgrade to Git Commit ID Plugin 4.0.5 
Closes gh-26845
 2021-06-10 08:38:38 +02:00
Stephane Nicoll
f79f2b1594 Upgrade to Spring AMQP 2.3.8 
Closes gh-26764
 2021-06-10 07:58:19 +02:00
Stephane Nicoll
ab90a948be Polish "Fix Optaplanner starter url" 
See gh-26816
 2021-06-10 07:53:07 +02:00
Geoffrey De Smet
736b0678e5 Fix Optaplanner starter url 
See gh-26816
 2021-06-10 07:52:35 +02:00
Stephane Nicoll
a7c538faa0 Upgrade to RSocket 1.1.1 
Closes gh-26839
 2021-06-10 07:46:17 +02:00
Stephane Nicoll
2201315556 Upgrade to Jetty 9.4.42.v20210604 
Closes gh-26838
 2021-06-10 07:46:17 +02:00
Stephane Nicoll
5cb1bd8245 Upgrade to Jetty Reactive HTTPClient 1.1.9 
Closes gh-26837
 2021-06-10 07:46:17 +02:00