Commit Graph

31233 Commits (6bf069d9e0544b085d59a92fc4411222773f6c31)
 

Author SHA1 Message Date
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
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
Andy Wilkinson c0fe23181c Merge branch '2.3.x' into 2.4.x
Closes gh-26329
4 years ago
Andy Wilkinson 94ca2d1e78 Test the Gradle plugin against Gradle 6.9-rc-1
Closes gh-26267
4 years ago
Stephane Nicoll 01d2c70e8c Merge branch '2.3.x' into 2.4.x
Closes gh-26327
4 years ago
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
4 years ago
Stephane Nicoll c134c38a68 Merge branch '2.3.x' into 2.4.x
Closes gh-26324
4 years ago
Stephane Nicoll a35abf6554 Merge pull request #26321 from matthiasstock
* pr/26321:
  Update copyright year of changed file
  Fix typo in NamedContributors Javadoc

Closes gh-26321
4 years ago
Stephane Nicoll af70da0e92 Update copyright year of changed file
See gh-26321
4 years ago
Matthias Stock 6c8c735027 Fix typo in NamedContributors Javadoc
See gh-26321
4 years ago
Stephane Nicoll 4ccce2a74f Merge branch '2.3.x' into 2.4.x
Closes gh-26322
4 years ago
Stephane Nicoll 1af7fa228b Merge pull request #26292 from Haarolean
* pr/26292:
  Polish "Improve failure analysis with a single bean cycle"
  Improve failure analysis with a single bean cycle

Closes gh-26292
4 years ago
Stephane Nicoll a6e59b357f Polish "Improve failure analysis with a single bean cycle"
See gh-26292
4 years ago
Roman Zabaluev 044c902a8c Improve failure analysis with a single bean cycle
See gh-26292
4 years ago
Stephane Nicoll 63d486158d Merge branch '2.3.x' into 2.4.x
Closes gh-26317
4 years ago
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
4 years ago
Scott Frederick 17fa215cf5 Merge branch '2.3.x' into 2.4.x
Closes gh-26312
4 years ago
Scott Frederick c37b9b8a8e Use layout configuration in Maven build-image goal
This commit changes the Maven build-image goal to honor the `layout` and
`layoutFactory` parameters to ensure that the archive content sent to the
builder is the same as is used by the `repackage` goal to build the
archive file.

Fixes gh-26216
4 years ago
Andy Wilkinson 4abd6b1387 Merge branch '2.3.x' into 2.4.x
Closes gh-26302
4 years ago
Andy Wilkinson 3cc1ed28ca Order test tasks to run after Checkstyle and formatting checks
Closes gh-26284
4 years ago
Andy Wilkinson 94519c33b1 Merge branch '2.3.x' into 2.4.x
Closes gh-26300
4 years ago
Andy Wilkinson ef5fbb0669 Configure bootBuildImage's targetJavaVersion using a provider
Previously, the targetJavaVersion property of bootBuildImage was set
using the project's target compatibility directly. This meant that
property's value would reflect the configured target compatibility at
the time of the task's creation and any subsequent changes to the
target compatibility would be missed.

This commit updates the registration of the bootBuildImage task to set
the value of the targetJavaVersion property using a provider. This
indirection means that the project's target compatibility isn't read
until the value of the targetJavaVersion is read, allowing any changes
to the target compatibility to be picked up even if they're made after
the bootBuildImage task has been created.

Fixes gh-26297
4 years ago
Stephane Nicoll f8a4aefce0 Merge branch '2.3.x' into 2.4.x
Closes gh-26298
4 years ago
Stephane Nicoll 0c09841013 Document property names to enable reactive health indicators
Closes gh-26279
4 years ago
Stephane Nicoll 27ae77000c Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 61758b04ae Upgrade Java 16 version in CI image
Closes gh-26291
4 years ago
Stephane Nicoll a3414fe803 Upgrade Ubuntu version in CI images
Closes gh-26288
4 years ago
Stephane Nicoll 5e284d9434 Upgrade Ubuntu version in CI images
Closes gh-26287
4 years ago
Andy Wilkinson 4417e16963 Merge branch '2.3.x' into 2.4.x
See gh-26260
4 years ago
Andy Wilkinson 3a3eb1bc31 Fix workaround for JDK-8156584
See gh-26252
4 years ago
Andy Wilkinson 097a436314 Merge branch '2.3.x' into 2.4.x
See gh-26260
4 years ago
Andy Wilkinson ecd1e536cc Refine workaround for JDK-8156584
The previous workaround worked but prevented caching of every test
task as the value of system property pointing to the custom security
properties file varied from build to build.

This commit refines the workaround to copy the file into the build
directory of the test task's project and reference it using a URL
that's relative to the task's working directory. This ensures that
the value of the system property doesn't change from build to build.

Closes gh-26252
4 years ago