Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,794 Commits 23 Branches 0 Tags
2d441198949d03d616bfb4485b66e8a60b2b9cfa
Commit Graph

13704 Commits

Author SHA1 Message Date
Andy Wilkinson
2d44119894 Merge branch '2.5.x' 
Closes gh-26943
 2021-06-17 11:43:15 +01:00
Andy Wilkinson
7ee3b287e1 Catch isEmbedded failure and treat database as not embedded 
Fixes gh-26926
 2021-06-17 11:42:26 +01:00
Andy Wilkinson
fb8f7afce5 Merge branch '2.5.x' 
Closes gh-26942
 2021-06-17 11:24:28 +01:00
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
ad8ce2aa05 Merge branch '2.5.x' 2021-06-16 23:43:14 -07:00
Phillip Webb
5c65b1bcde Fix asciidoctor anchor references 
See gh-26939
 2021-06-16 23:42:29 -07:00
Phillip Webb
7bd6611e4c Merge branch '2.5.x' 
Closes gh-26940
 2021-06-16 22:43:52 -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 d1b256a169 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
256a523e84 Merge branch '2.5.x' 
Closes gh-26936
 2021-06-16 16:00:09 -05: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
76ac18f282 Merge branch '2.5.x' 
Closes gh-26929
 2021-06-16 13:06:44 +01: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
1c49ca6ff2 Merge branch '2.5.x' 
Closes gh-26924
 2021-06-16 08:28:17 +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
18dc99dadb Merge branch '2.5.x' 
Closes gh-26920
 2021-06-15 17:31:21 -07: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
63976367be Merge branch '2.5.x' 
Closes gh-26918
 2021-06-15 22:21:34 +01: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
e0d0be97c5 Merge branch '2.5.x' 
See gh-26902
 2021-06-15 20:01:35 +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
a1a86e75ac Merge branch '2.5.x' 
Closes gh-26912
 2021-06-15 08:38:51 +02: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
Stephane Nicoll
caa87f1a90 Merge branch '2.5.x' 
Closes gh-26911
 2021-06-15 08:24:30 +02:00
izeye
eeefaf4314 Fix Javadoc deprecated since 
See gh-26907
 2021-06-15 08:23:13 +02:00
Stephane Nicoll
52fedb2bb4 Add support for InfluxDB 2.x 
Closes gh-25891
 2021-06-15 08:21:37 +02:00
Andy Wilkinson
043cf88687 Merge branch '2.5.x' 
Closes gh-26905
 2021-06-14 21:02:19 +01: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
3b613a4f2d Merge branch '2.5.x' 
Closes gh-26902
 2021-06-14 19:16:52 +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
Madhura Bhave
91ca9763e0 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:25:01 -07:00
Andy Wilkinson
0ec598c99d Merge branch '2.5.x' 2021-06-14 13:36:37 +01: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
bc715c64b1 Merge branch '2.5.x' 
Closes gh-26892
 2021-06-14 13:33:19 +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
6982bbdc2b Merge branch '2.5.x' 
Closes gh-26890
 2021-06-14 11:06:44 +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
06c6eee7c5 Merge branch '2.5.x' 
Closes gh-26887
 2021-06-14 10:53:42 +01:00