Commit Graph

17131 Commits

Author SHA1 Message Date
Stephane Nicoll
559af275a4 Merge branch '2.3.x' into 2.4.x
Closes gh-26405
2021-05-07 09:14:35 +02:00
Sach Nguyen
afa77b8253 Fix wrong reference to Cassandra in DockerImageNames#couchbase
See gh-26399
2021-05-07 09:12:43 +02:00
Phillip Webb
ba1e5fb5e8 Merge branch '2.4.x'
Closes gh-26402
2021-05-06 19:50:52 -07:00
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>
2021-05-06 19:50:41 -07:00
Phillip Webb
777abc4aac Merge branch '2.4.x'
Closes gh-26401
2021-05-06 19:50:17 -07:00
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>
2021-05-06 19:43:40 -07:00
Scott Frederick
922517c0e5 Polish 2021-05-06 19:43:31 -07:00
Andy Wilkinson
2976fd9165 Merge branch '2.4.x'
Closes gh-26397
2021-05-06 20:12:41 +01:00
Andy Wilkinson
fe696ee22a Merge branch '2.3.x' into 2.4.x
Closes gh-26396
2021-05-06 20:11:59 +01:00
Andy Wilkinson
ef9e3bafff Test our Gradle plugin against 6.9-rc-2
Closes gh-26395
2021-05-06 20:10:54 +01:00
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
2021-05-06 19:40:47 +01:00
Stephane Nicoll
4bbfd5a3b7 Start building against Spring Framework 5.3.7 snapshots
See gh-26361
2021-05-06 17:12:20 +02:00
Stephane Nicoll
d0e3b16f6d Start building against Reactor 2020.0.7 snapshots
See gh-26359
2021-05-06 17:11:58 +02:00
Stephane Nicoll
3a596ed130 Start building against Spring Framework 5.3.7 snapshots
See gh-26360
2021-05-06 16:43:17 +02:00
Stephane Nicoll
17fdd5a79f Start building against Reactor 2020.0.7 snapshots
See gh-26358
2021-05-06 16:42:45 +02:00
Phillip Webb
d3207b107c Polish docs 2021-05-05 23:42:22 -07:00
Andy Wilkinson
aeea15be0f Merge branch '2.4.x'
Closes gh-26365
2021-05-05 09:53:20 +01:00
Andy Wilkinson
f7fae8f0f2 Merge branch '2.3.x' into 2.4.x
Closes gh-26364
2021-05-05 09:52:53 +01:00
Andy Wilkinson
b3275c5647 Align productionRuntimeClasspath with runtimeClasspath
Fixes gh-25798
2021-05-05 09:52:44 +01:00
Phillip Webb
65c00f373a Polish 2021-05-04 14:07:58 -07:00
Phillip Webb
711a0c19e6 Use consistent asciidoctor subs attribute
Closes gh-25101
2021-05-04 13:01:20 -07:00
Phillip Webb
979fa12ca9 Polish source type for Gradle snippets 2021-05-04 10:35:39 -07:00
Phillip Webb
57e54af6f5 Delete R2dbcDatabaseInitializationConfiguration
The `R2dbcDatabaseInitializationConfiguration` docs class is not needed
in 2.5.x.

Closes gh-26225
2021-05-04 08:15:14 -07:00
Andy Wilkinson
a164658dab Merge branch '2.4.x'
Closes gh-26349
2021-05-04 09:46:23 +01:00
Andy Wilkinson
cb1af35dde Merge branch '2.3.x' into 2.4.x
Closes gh-26348
2021-05-04 09:46:01 +01:00
Andy Wilkinson
6440843358 Do not wait indefinitely in initialize test if refresh fails
Closes gh-26286
2021-05-04 09:44:56 +01:00
Phillip Webb
d6d1d95741 Use American English spellings 2021-05-03 22:39:45 -07:00
Phillip Webb
b5583a4620 Polish doc code samples
See gh-6313
2021-05-03 22:39:44 -07:00
Phillip Webb
9aad29da0c Extract code samples from docs
See gh-6313
2021-05-03 17:46:37 -07:00
Scott Frederick
0893df4a01 Merge branch '2.4.x'
Closes gh-26346
2021-05-03 14:53:41 -05:00
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
2021-05-03 14:52:22 -05:00
Phillip Webb
b314d848dc Polish docs code
See gh-6313
2021-04-30 18:19:52 -07:00
Phillip Webb
09e85806d6 Align docs package structure with heading IDs
See gh-6313
2021-04-30 16:34:35 -07:00
Andy Wilkinson
b976483852 Merge branch '2.4.x'
Closes gh-26330
2021-04-30 16:56:46 +01:00
Andy Wilkinson
c0fe23181c Merge branch '2.3.x' into 2.4.x
Closes gh-26329
2021-04-30 16:55:10 +01:00
Andy Wilkinson
94ca2d1e78 Test the Gradle plugin against Gradle 6.9-rc-1
Closes gh-26267
2021-04-30 16:52:52 +01:00
Stephane Nicoll
6df3a8291e Merge branch '2.4.x'
Closes gh-26328
2021-04-30 14:36:04 +02:00
Stephane Nicoll
01d2c70e8c Merge branch '2.3.x' into 2.4.x
Closes gh-26327
2021-04-30 14:35:52 +02:00
Stephane Nicoll
07358c6b79 Support reactive infrastructure with DataRedisTest
Previously DataRedisTest-annotated test could not use reactive
operations as RedisReactiveAutoConfiguration is not considered. This
commit includes this auto-configuration and adds a test to exercise this
scenario.

Closes gh-26319
2021-04-30 14:32:25 +02:00
Stephane Nicoll
367fd64c23 Merge branch '2.4.x'
Closes gh-26325
2021-04-30 13:40:32 +02:00
Stephane Nicoll
c134c38a68 Merge branch '2.3.x' into 2.4.x
Closes gh-26324
2021-04-30 13:40:24 +02:00
Stephane Nicoll
af70da0e92 Update copyright year of changed file
See gh-26321
2021-04-30 13:35:28 +02:00
Matthias Stock
6c8c735027 Fix typo in NamedContributors Javadoc
See gh-26321
2021-04-30 13:35:17 +02:00
Stephane Nicoll
3475e01cda Merge branch '2.4.x'
Closes gh-26323
2021-04-30 13:32:56 +02:00
Stephane Nicoll
4ccce2a74f Merge branch '2.3.x' into 2.4.x
Closes gh-26322
2021-04-30 13:32:40 +02:00
Stephane Nicoll
a6e59b357f Polish "Improve failure analysis with a single bean cycle"
See gh-26292
2021-04-30 13:30:58 +02:00
Roman Zabaluev
044c902a8c Improve failure analysis with a single bean cycle
See gh-26292
2021-04-30 13:18:13 +02:00
Stephane Nicoll
4febe6485c Merge branch '2.4.x'
Closes gh-26318
2021-04-30 08:53:31 +02:00
Stephane Nicoll
63d486158d Merge branch '2.3.x' into 2.4.x
Closes gh-26317
2021-04-30 08:53:20 +02:00
Stephane Nicoll
3f528bb0eb Mark SpringBootConfiguration as Indexed
Previously, users of the components.index could not use the index in
scenario where Spring Boot needs to locate the SpringBootConfiguration
to use to bootstrap the test context, as AnnotatedClassFinder scans
the classpath for that stereotype specifically and that requires a
dedicated entry for it.

This commit makes sure that a SpringBootConfiguration-annotated type has
a dedicated entry in the components index.

Closes gh-26308
2021-04-30 08:47:45 +02:00