Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
31,350 Commits 23 Branches 0 Tags
a1e279f736bb1bb50fa9a684414472dfa9925795
Commit Graph

12607 Commits

Author SHA1 Message Date
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
7ba575d392 Prevent RestarterTests.testRestart from triggering unwanted restarts 
See gh-26900
 2021-06-15 19:59:37 +01:00
Andy Wilkinson
32effdba0a Try to stabilize RestarterTests.testRestart 
Closes gh-26900
 2021-06-14 19:15:09 +01:00
Andy Wilkinson
16bfa669e1 Polish authors separators 2021-06-14 13:35:30 +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
c89430e174 Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout 
Closes gh-26888
 2021-06-14 11:04:23 +01:00
Andy Wilkinson
7a14a53250 Try to stabilize TunnelClientTests.addListener() 
Closes gh-26885
 2021-06-14 10:52:12 +01:00
Andy Wilkinson
37d395bad2 Try to stabilize flaky MetricsWebClientFilterFunction test 
Closes gh-26855
 2021-06-11 19:48:34 +01:00
Andy Wilkinson
608c4509f8 Try to stabilise SocketTargetServerConnectionTests 
Closes gh-26857
 2021-06-11 15:55:01 +01:00
Andy Wilkinson
186658cc12 Attempt to stabilize stopTriggersTunnelClose 
Closes gh-26856
 2021-06-11 15:48:50 +01: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
Madhura Bhave
e3042b38f5 Merge branch '2.3.x' into 2.4.x 2021-06-09 14:45:23 -07:00
Madhura Bhave
63806d5bac Remove duplicate copyright notice from docs 2021-06-09 14:44:44 -07:00
Andy Wilkinson
d79b3597bb Upgrade to Spring AMQP 2.3.8 
Closes gh-26762
 2021-06-09 21:39:24 +01:00
Andy Wilkinson
d4200a7c56 Upgrade to Spring Integration 5.3.8.RELEASE 
Closes gh-26772
 2021-06-09 21:20:14 +01:00
Andy Wilkinson
03e1b255ea Upgrade to Spring AMQP 2.2.18.RELEASE 
Closes gh-26770
 2021-06-09 21:18:37 +01:00
Andy Wilkinson
4a11c6a135 Upgrade to Spring Kafka 2.6.9 
Closes gh-26763
 2021-06-09 19:29:23 +01:00
Andy Wilkinson
53068a2489 Upgrade to Spring Kafka 2.5.14.RELEASE 
Closes gh-26771
 2021-06-09 19:15:08 +01:00
Andy Wilkinson
a1c5fcca58 Move common Asciidoctor configuration into our conventions 
Closes gh-26620
 2021-06-09 18:00:45 +01:00
Stephane Nicoll
6a7a11ba59 Upgrade to RSocket 1.1.1 
Closes gh-26836
 2021-06-09 15:24:13 +02:00
Stephane Nicoll
66ae421f74 Upgrade to Neo4j Java Driver 4.1.3 
Closes gh-26835
 2021-06-09 15:24:12 +02:00
Stephane Nicoll
f9a0b0308d Upgrade to Jetty 9.4.42.v20210604 
Closes gh-26834
 2021-06-09 15:24:11 +02:00
Stephane Nicoll
6cdbed7dc3 Upgrade to Jetty Reactive HTTPClient 1.1.9 
Closes gh-26833
 2021-06-09 15:24:09 +02:00
Stephane Nicoll
872ec0bf00 Upgrade to RSocket 1.0.5 
Closes gh-26832
 2021-06-09 15:00:55 +02:00
Stephane Nicoll
f73e7bcc0c Upgrade to Neo4j OGM 3.2.24 
Closes gh-26831
 2021-06-09 15:00:54 +02:00
Stephane Nicoll
1ef0068b38 Upgrade to Jetty 9.4.42.v20210604 
Closes gh-26830
 2021-06-09 15:00:53 +02:00
Stephane Nicoll
0563955324 Upgrade to Jetty Reactive HTTPClient 1.1.9 
Closes gh-26829
 2021-06-09 15:00:51 +02:00
Stephane Nicoll
e9592229fc Upgrade to Spring Framework 5.3.8 
Closes gh-26760
 2021-06-09 12:01:55 +02:00
Andy Wilkinson
303edac6bb Merge branch '2.3.x' into 2.4.x 
Closes gh-26826
 2021-06-09 09:13:06 +01:00
Andy Wilkinson
d1e1796f76 Consider overridden getRootUri() when getting root URI 
Fixes gh-26812
 2021-06-09 09:12:37 +01:00
Phillip Webb
d5264664e6 Merge branch '2.3.x' into 2.4.x 
Closes gh-26822
 2021-06-08 18:17:18 -07:00
Phillip Webb
1f6983c4c9 Make CompositeHealth.getDetails() public 
Change `CompositeHealth.getDetails()` to public so that it serializes
correctly when `MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS` is
disabled.

Fixes gh-26797
 2021-06-08 18:17:09 -07:00
Phillip Webb
4d62e47c5d Merge branch '2.3.x' into 2.4.x 2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99 Update copyright year of changed files 2021-06-08 18:03:46 -07:00
Stephane Nicoll
bac89a3919 Upgrade to Undertow 2.2.8.Final 
Closes gh-26791
 2021-06-07 07:57:54 +02:00
Stephane Nicoll
d6f22f0802 Upgrade to jOOQ 3.14.11 
Closes gh-26790
 2021-06-07 07:57:53 +02:00
Stephane Nicoll
99169af57c Upgrade to Johnzon 1.2.13 
Closes gh-26789
 2021-06-07 07:57:52 +02:00
Stephane Nicoll
fe249dd772 Upgrade to JBoss Logging 3.4.2.Final 
Closes gh-26788
 2021-06-07 07:57:51 +02:00
Stephane Nicoll
5be4a9ab50 Upgrade to Hibernate 5.4.32.Final 
Closes gh-26787
 2021-06-07 07:57:50 +02:00
Stephane Nicoll
e496d2e321 Upgrade to Gson 2.8.7 
Closes gh-26786
 2021-06-07 07:57:49 +02:00
Stephane Nicoll
16ff9318b5 Upgrade to Ehcache3 3.9.4 
Closes gh-26785
 2021-06-07 07:57:48 +02:00
Stephane Nicoll
90f96e2d48 Upgrade to Dropwizard Metrics 4.1.22 
Closes gh-26784
 2021-06-07 07:57:47 +02:00
Stephane Nicoll
cfaab0904b Upgrade to AppEngine SDK 1.9.89 
Closes gh-26783
 2021-06-07 07:57:46 +02:00
Phillip Webb
7396e1e743 Fix property ordering within '.' and '/config' 
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.

Prior to this commit, the default search locations considered for
application properties/yaml files was the following:

	optional:classpath:/
	optional:classpath:/config/
	optional:file:./
	optional:file:./config/
	optional:file:./config/*/

Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.

This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files

	optional:classpath:/;optional:classpath:/config/
	optional:file:./;optional:file:./config/;optional:file:./config/*/

Closes gh-26593
 2021-06-06 21:05:54 -07:00
Stephane Nicoll
1e680241ed Upgrade to Johnzon 1.2.13 
Closes gh-26781
 2021-06-06 20:25:54 +02:00
Stephane Nicoll
3a0794da4b Upgrade to JBoss Logging 3.4.2.Final 
Closes gh-26780
 2021-06-06 20:25:52 +02:00
Stephane Nicoll
84a4693dcf Upgrade to Hibernate 5.4.32.Final 
Closes gh-26779
 2021-06-06 20:25:51 +02:00
Stephane Nicoll
790a8c1f47 Upgrade to Gson 2.8.7 
Closes gh-26778
 2021-06-06 20:25:50 +02:00
Stephane Nicoll
7ccbe3c5f8 Upgrade to Dropwizard Metrics 4.1.22 
Closes gh-26777
 2021-06-06 20:25:48 +02:00