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

32649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Bhave
2e2d1fe8d3 Merge branch '2.4.x' into main 2021-06-09 14:46:36 -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
12d57b69cf Merge branch '2.4.x' 2021-06-09 21:52:53 +01:00
Andy Wilkinson
d79b3597bb Upgrade to Spring AMQP 2.3.8 
Closes gh-26762
 2021-06-09 21:39:24 +01:00
Andy Wilkinson
015fba2686 Merge branch '2.4.x' 2021-06-09 21:37:05 +01:00
Andy Wilkinson
f111a90525 Merge branch '2.3.x' into 2.4.x 2021-06-09 21:36:50 +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
9fb7cf49e4 Upgrade to Spring Kafka 2.7.2 
Closes gh-26765
 2021-06-09 19:43:37 +01:00
Andy Wilkinson
df2b0f6bf2 Merge branch '2.4.x' 2021-06-09 19:42:34 +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
7a893b9292 Merge branch '2.4.x' 2021-06-09 19:28:27 +01:00
Andy Wilkinson
66823c7641 Merge branch '2.3.x' into 2.4.x 2021-06-09 19:28:15 +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
46d7999b1d Lower spring.sql.init.enabled's deprecation level to warning 
See gh-26682
 2021-06-09 19:11:20 +01:00
Andy Wilkinson
de410b7621 Merge branch '2.4.x' 
Closes gh-26828
 2021-06-09 18:01:32 +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
f159a5a779 Merge branch '2.4.x' 2021-06-09 16:04:39 +02:00
Stephane Nicoll
8ce7a2b5a3 Merge branch '2.3.x' into 2.4.x 2021-06-09 16:04:26 +02: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
8590eccac4 Polish 
See gh-26682
 2021-06-09 14:47:54 +02:00
Stephane Nicoll
98ed0458cd Merge branch '2.4.x' 2021-06-09 12:22:19 +02:00
Stephane Nicoll
d23b07a166 Upgrade to Spring Framework 5.3.8 
Closes gh-26761
 2021-06-09 12:21:45 +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
03f8a46c80 Test our Gradle plugin against 7.1-rc-2 
Closes gh-26825
 2021-06-09 09:41:25 +01:00
Andy Wilkinson
c5728c9560 Merge branch '2.4.x' 
Closes gh-26827
 2021-06-09 09:13:21 +01: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
850088de32 Merge branch '2.4.x' 
Closes gh-26823
 2021-06-08 18:17:33 -07: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
f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -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
Phillip Webb
703eaa71f4 Remove main class configuration fallback 
Remove fallback code since we now require Gradle 6.8 and can depend
on the `getMainClass` method being present.

Closes gh-26794
 2021-06-08 18:00:50 -07:00
Phillip Webb
b7ac1e6cd7 Rename derivefrom to align with DataSourceBuilder 
Rename the `derivefrom` method in `ConnectionFactoryBuilder` to
`derivedFrom` to align with `DataSourceBuilder`.

Fixes gh-26810
 2021-06-08 15:44:01 -07:00
Phillip Webb
f8c3e0e5aa Respect custom username/password properties 
Fix a bug in `DataSourceInitializationConfiguration` and in
`R2dbcInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
 2021-06-08 14:58:39 -07:00
Phillip Webb
d19b2681ab Rework build-image-customization table in docs 
Collapse parameter name and user property into a single column to give
a little more room for the description and default value.

Closes gh-25739
 2021-06-08 14:46:53 -07:00
Phillip Webb
6ab2df5698 Order DataSourceScriptDatabaseInitializer last 
Change the order of `DataSourceScriptDatabaseInitializerDetector` so
that it always runs last. This update allows script initialization to
be combined with a high-level migration tool such as Flyway.

Closes gh-26692
 2021-06-08 14:10:59 -07:00
Phillip Webb
dafd511284 Support DatabaseInitializerDetector ordering 
Update `DatabaseInitializationDependencyConfigurer` so that depends-on
ordering is applied based on the `DatabaseInitializerDetector` order.

Prior to this commit, if multiple DatabaseInitializer beans were
detected the order in which they were initialized was not defined.

See gh-26692
 2021-06-08 14:10:55 -07:00
Scott Frederick
fba5ffc626 Fix FilePermissionsTests on Windows 
See gh-26658
 2021-06-08 15:58:03 -05:00
Andy Wilkinson
8df6392ca5 Polish 
The use of the file's absolute path caused test failures on Windows.

See gh-26682
 2021-06-08 18:28:09 +01:00