Andy Wilkinson
b3071dab91
Merge branch '2.4.x'
...
Closes gh-26412
4 years ago
Andy Wilkinson
fe4d20c976
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26411
4 years ago
Andy Wilkinson
6daf67a88c
Upgrade to Gradle 6.9
...
Closes gh-26408
4 years ago
Stephane Nicoll
b4424605af
Merge branch '2.4.x'
...
Closes gh-26406
4 years ago
Stephane Nicoll
559af275a4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26405
4 years ago
Stephane Nicoll
22e965fd61
Merge pull request #26399 from nguyensach
...
* pr/26399:
Fix wrong reference to Cassandra in DockerImageNames#couchbase
Closes gh-26399
4 years ago
Sach Nguyen
afa77b8253
Fix wrong reference to Cassandra in DockerImageNames#couchbase
...
See gh-26399
4 years ago
Phillip Webb
ba1e5fb5e8
Merge branch '2.4.x'
...
Closes gh-26402
4 years ago
Phillip Webb
efad44be43
Refine mandatory location checking logic
...
Update `ConfigDataEnvironment.checkMandatoryLocations` to use the
actual locations that were imported, including those that were skipped
because the related `ConfigDataResource` had already been imported by a
different location.
Prior to this commit, any location that was skipped because it had
already been imported would throw a `ConfigDataNotFoundException`.
Closes gh-26147
Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
4 years ago
Phillip Webb
777abc4aac
Merge branch '2.4.x'
...
Closes gh-26401
4 years ago
Phillip Webb
fef62f784a
Import profile specific files in correct order
...
Update `StandardConfigDataLoader` to mark profile specific files with
`Option.PROFILE` so that they are added in the correct order. This is
a variation of the same issue described in commit 5774ea3f0c
.
Closes gh-26400
Co-authored-by: Scott Frederick <sfrederick@vmware.com>
Co-authored-by: Madhura Bhave <mbhave@vmware.com>
4 years ago
Scott Frederick
922517c0e5
Polish
4 years ago
Andy Wilkinson
2976fd9165
Merge branch '2.4.x'
...
Closes gh-26397
4 years ago
Andy Wilkinson
fe696ee22a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26396
4 years ago
Andy Wilkinson
ef9e3bafff
Test our Gradle plugin against 6.9-rc-2
...
Closes gh-26395
4 years ago
Andy Wilkinson
b1f3d91f7d
Make sure the Couchbase's Jackson module is available
...
When we customize Couchbase's JacksonJsonSerializer with the
auto-configured ObjectMapper, Couchbase's JsonValueModule is lost.
This prevents the storage and retrieval of JSON objects.
This commit updates the Couchbase auto-configuration to use a copy
of the auto-configured ObjectMapper with the JsonValueModule added
to it.
Fixes gh-26363
4 years ago
Stephane Nicoll
cc702ede7e
Merge branch '2.4.x'
4 years ago
Stephane Nicoll
4bbfd5a3b7
Start building against Spring Framework 5.3.7 snapshots
...
See gh-26361
4 years ago
Stephane Nicoll
d0e3b16f6d
Start building against Reactor 2020.0.7 snapshots
...
See gh-26359
4 years ago
Stephane Nicoll
3a596ed130
Start building against Spring Framework 5.3.7 snapshots
...
See gh-26360
4 years ago
Stephane Nicoll
17fdd5a79f
Start building against Reactor 2020.0.7 snapshots
...
See gh-26358
4 years ago
Phillip Webb
d3207b107c
Polish docs
4 years ago
Andy Wilkinson
aeea15be0f
Merge branch '2.4.x'
...
Closes gh-26365
4 years ago
Andy Wilkinson
f7fae8f0f2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26364
4 years ago
Andy Wilkinson
b3275c5647
Align productionRuntimeClasspath with runtimeClasspath
...
Fixes gh-25798
4 years ago
Phillip Webb
65c00f373a
Polish
4 years ago
Phillip Webb
711a0c19e6
Use consistent asciidoctor subs attribute
...
Closes gh-25101
4 years ago
Phillip Webb
979fa12ca9
Polish source type for Gradle snippets
4 years ago
Phillip Webb
57e54af6f5
Delete R2dbcDatabaseInitializationConfiguration
...
The `R2dbcDatabaseInitializationConfiguration` docs class is not needed
in 2.5.x.
Closes gh-26225
4 years ago
Andy Wilkinson
f17af829ee
Merge branch '2.4.x'
...
Closes gh-26354
4 years ago
Andy Wilkinson
75bb50bd02
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26353
4 years ago
Andy Wilkinson
deca737b01
Configure source and target compatibility at the task level
...
Closes gh-26350
4 years ago
Andy Wilkinson
d18af399f9
Merge branch '2.4.x'
...
Closes gh-26352
4 years ago
Andy Wilkinson
1417c1b0c4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26351
4 years ago
Andy Wilkinson
4c42810df9
Ensure that server tests pick up latest snapshots
...
Closes gh-25921
4 years ago
Andy Wilkinson
a164658dab
Merge branch '2.4.x'
...
Closes gh-26349
4 years ago
Andy Wilkinson
cb1af35dde
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26348
4 years ago
Andy Wilkinson
6440843358
Do not wait indefinitely in initialize test if refresh fails
...
Closes gh-26286
4 years ago
Phillip Webb
d6d1d95741
Use American English spellings
4 years ago
Phillip Webb
b5583a4620
Polish doc code samples
...
See gh-6313
4 years ago
Phillip Webb
9aad29da0c
Extract code samples from docs
...
See gh-6313
4 years ago
Scott Frederick
0893df4a01
Merge branch '2.4.x'
...
Closes gh-26346
4 years ago
Scott Frederick
dbee0cf9f1
Ignore empty values in config location properties
...
This commit updates config data property binding to ignore empty
elements in `spring.config.location` and `spring.config.import`
property values when a value is a comma-delimited string
representing a collection.
Fixes gh-26342
4 years ago
Stephane Nicoll
199bc2dcbe
Merge pull request #26320 from agg505
...
* pr/26320:
Polish README
Closes gh-26320
4 years ago
vic wu
a58e5f745d
Polish README
...
See gh-26320
4 years ago
Phillip Webb
b314d848dc
Polish docs code
...
See gh-6313
4 years ago
Phillip Webb
09e85806d6
Align docs package structure with heading IDs
...
See gh-6313
4 years ago
Scott Frederick
2c770217bb
Merge branch '2.4.x'
...
Closes gh-26334
4 years ago
Scott Frederick
65cb654a22
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26333
4 years ago
Scott Frederick
524ab4cea7
Move content from CONTRIBUTING.adoc to the wiki
...
Closes gh-26332
4 years ago