Commit Graph

32374 Commits (0c8d8191506bbb35f88411f12981415a587f8533)
 

Author SHA1 Message Date
Stephane Nicoll 7539ff0b48 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 526af5a790 Upgrade to Reactor Dysprosium-SR20
Closes gh-26424
4 years ago
Stephane Nicoll 09fb15b01b Merge branch '2.4.x' 4 years ago
Stephane Nicoll 21fbb2e79c Start building against Micrometer 1.6.7 snapshots
See gh-26430
4 years ago
Stephane Nicoll 0f7db901d9 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 5cdabc9729 Start building against Spring Kafka 2.5.13 snapshots
See gh-26429
4 years ago
Stephane Nicoll 47d5592035 Start building against Spring AMQP 2.2.17 snapshots
See gh-26428
4 years ago
Stephane Nicoll 3a8500126b Start building against Micrometer 1.5.14 snapshots
See gh-26427
4 years ago
Stephane Nicoll 9772867862 Start building against Spring Batch 4.2.7 snapshots
See gh-26426
4 years ago
Stephane Nicoll 1b9e66a7c8 Merge branch '2.4.x' 4 years ago
Stephane Nicoll fc1f09b414 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 66fe98eb3f Start building against Spring Framework 5.2.15 snapshots
See gh-26425
4 years ago
Stephane Nicoll c059759c4d Start building against Reactor Dysprosium-SR20 snapshots
See gh-26424
4 years ago
Stephane Nicoll 8ff07a8185 Merge pull request #26420 from dreis2211
* pr/26420:
  Test our Gradle Plugin against Gradle 7.0.1

Closes gh-26420
4 years ago
dreis2211 ba2a4781d2 Test our Gradle Plugin against Gradle 7.0.1
See gh-26420
4 years ago
Phillip Webb 87d8aedd3c Use spring-pdf backend for PDF generation
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.

Closes gh-26373
4 years ago
Stephane Nicoll 65db4411ae Merge pull request #26417 from nguyensach
* pr/26417:
  Update copyright year of changed file
  Use try-with-resources statement

Closes gh-26417
4 years ago
Stephane Nicoll ffbd3b819f Update copyright year of changed file
See gh-26417
4 years ago
nguyensach c82de83202 Use try-with-resources statement
See gh-26417
4 years ago
Stephane Nicoll 217f6efa64 Start building against Micrometer 1.7.0 snapshots
See gh-26379
4 years ago
Stephane Nicoll 8d2fa26a99 Start building against Spring LDAP 2.3.4 snapshots
See gh-26394
4 years ago
Stephane Nicoll 14dd98c690 Start building against Spring Batch 4.3.3 snapshots
See gh-26392
4 years ago
Stephane Nicoll 98b48c1069 Start building against Spring WS 3.1.0 snapshots
See gh-26390
4 years ago
Stephane Nicoll f5cba056d7 Start building against Spring Session 2021.0.0 snapshots
See gh-26389
4 years ago
Stephane Nicoll 8fcba2c333 Start building against Spring Integration 5.5.0 snapshots
See gh-26388
4 years ago
Stephane Nicoll 55ccf9f750 Start building against Spring Security 5.5.0 snapshots
See gh-26387
4 years ago
Stephane Nicoll c9cd7cae51 Start building against Spring Kafka 2.7.1 snapshots
See gh-26386
4 years ago
Stephane Nicoll c85936f004 Start building against Spring AMQP 2.3.7 snapshots
See gh-26384
4 years ago
Stephane Nicoll b93263ec3c Start building against Spring Data 2021.0.1 snapshots
See gh-26382
4 years ago
Stephane Nicoll 10dca8d829 Start building against Spring HATEOAS 1.3.1 snapshots
See gh-26380
4 years ago
Stephane Nicoll 907cc92497 Merge branch '2.4.x' 4 years ago
Stephane Nicoll a5cb9540ca Start building against Spring LDAP 2.3.4 snapshots
See gh-26393
4 years ago
Stephane Nicoll 0d920894b7 Start building against Spring Batch 4.3.3 snapshots
See gh-26391
4 years ago
Stephane Nicoll 618475887c Start building against Spring Kafka 2.6.8 snapshots
See gh-26385
4 years ago
Stephane Nicoll 2479f69db1 Start building against Spring AMQP 2.3.7 snapshots
See gh-26383
4 years ago
Stephane Nicoll 05a3b9bbeb Start building against Spring Data 2020.0.9 snapshots
See gh-26381
4 years ago
Andy Wilkinson dc5f115c04 Document support for Gradle 6.9
Closes gh-26409
4 years ago
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