Commit Graph

31365 Commits (9477231c51ff799239234989cf182fec7c74e1bb)
 

Author SHA1 Message Date
Scott Frederick 32d378a348 Use test harness for image building integration tests
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.

Fixes gh-25838
4 years ago
Andy Wilkinson e5af3dbfc7 Upgrade to Spring HATEOAS 1.2.6
Closes gh-26442
4 years ago
Andy Wilkinson e29d2e208e Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson b3af6d6403 Polish
See gh-25798
4 years ago
Andy Wilkinson 322d6455db Upgrade to Micrometer 1.6.7
Closes gh-26430
4 years ago
Andy Wilkinson 7a2d5d4eee Upgrade to Spring Framework 5.3.7
Closes gh-26360
4 years ago
Andy Wilkinson 7205e55a0d Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson ece845a4e0 Upgrade to Micrometer 1.5.14
Closes gh-26427
4 years ago
Andy Wilkinson 1a32a864d4 Upgrade to Spring Framework 5.2.15.RELEASE
Closes gh-26425
4 years ago
Stephane Nicoll efc0a7da44 Properly assert that auto-configured TaskExecutor is lazy
This commit fixes a flawed assertion that was relying on a log message
to validate the TaskExecutor is lazy. The level of the log message has
changed in framework and broke the test. We now rather check the bean
definition.
4 years ago
Madhura Bhave eff024b0ce Polish "Process additional profiles before config files processing"
See gh-25817
4 years ago
nguyensach 97fd9a7c77 Process additional profiles before config files processing
Additional profiles were being processed after config file processing
when legacy processing was used.
This commit also restores the order in which additional profiles are added
when legacy processing is used.
Active profiles take precedence over additional profiles.

See gh-25817
4 years ago
Stephane Nicoll c50afc69bd Upgrade to Reactor 2020.0.7
Closes gh-26358
4 years ago
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 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 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 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 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 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 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 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 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
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
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
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 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 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
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