Commit Graph

30102 Commits (e7004dbc6f7d2f73ecf2e262caa09054d2e184b2)
 

Author SHA1 Message Date
Madhura Bhave 58f0e253e7 Merge branch '2.4.x'
Closes gh-24543
4 years ago
Madhura Bhave a1ea5b49ec Merge branch '2.3.x' into 2.4.x
Closes gh-24542
4 years ago
Madhura Bhave 09e07428cc Configure CORS in default security configuration for MVC
Fixes gh-11987
4 years ago
Scott Frederick b51caf2c45 Merge branch '2.4.x'
Closes gh-24539
4 years ago
Scott Frederick 4e603d9239 Merge branch '2.3.x' into 2.4.x
Closes gh-24538
4 years ago
Scott Frederick e4d124dc45 Improve error message with Maven build-image and war packaging
Fixes gh-24522
4 years ago
Phillip Webb c8f59e1239 Merge branch '2.4.x'
Closes gh-24537
4 years ago
Phillip Webb d6890e39a7 Merge branch '2.3.x' into 2.4.x
Closes gh-24536
4 years ago
Phillip Webb 2cd1459a9a Merge pull request #24532 from dreis2211
* pr/24532:
  Avoid duplicates in MergedContextConfiguration

Closes gh-24532
4 years ago
Scott Frederick 1f21933c48 Merge branch '2.4.x'
Closes gh-24534
4 years ago
Scott Frederick dfcabe1665 Merge branch '2.3.x' into 2.4.x
Fixes gh-24521 in 2.4.2
4 years ago
dreis2211 0ec603cdad Avoid duplicates in MergedContextConfiguration
Remove duplicate config attribute classes by using a `Set` rather
than a `List` in the `SpringBootTestContextBootstrapper`.

See gh-24532
4 years ago
Scott Frederick 0e5df2296e Fail with Gradle bootBuildImage and war packaging
Prior to this commit, running the bootBuildImage Gradle task on a
project configured for war packaging would result in a jar file being
built and used in the image instead of the war file. With this commit
an error will be thrown from the plugin in this case.

Fixes gh-24521
4 years ago
Andy Wilkinson 4dd0e9ae54 Merge branch '2.4.x'
Closes gh-24527
4 years ago
Andy Wilkinson 5fdb2ae2fd Protect PluginApplicationActions against absent plugin classes
Closes gh-24526
4 years ago
Phillip Webb 5bd5ca5107 Merge branch '2.4.x'
Closes gh-24524
4 years ago
Phillip Webb 38e4c2a179 Add ConfigDataEnvironmentUpdateListener support
Add an overloaded `ConfigDataEnvironmentPostProcessor.applyTo` method
that accepts a listener that can used to track the updates that were
applied to the `Environment`.

The listener can be used to track the which `ConfigDataLocation` and
the `ConfigDataResource` were used to add a `PropertySource`. The lister
can also be used to tell which profiles were applied.

This enhancement is being added in a patch release because it's will
be useful for Spring Cloud 2020.0.0.

Closes gh-24504
4 years ago
Phillip Webb 5e1a69e90e Polish 4 years ago
Phillip Webb 308c2042ee Merge branch '2.4.x' 4 years ago
Phillip Webb 4fba7d0c60 Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb 29300530c6 Polish 4 years ago
Phillip Webb f855256687 Merge branch '2.4.x' 4 years ago
Phillip Webb a2d0b64e9c Test that empty property files can be used
Add an additional test to ensure that empty property files do not
throw ConfigDataLocationNotFoundException exceptions.

See gh-24499
See gh-24515
4 years ago
Andy Wilkinson 4040105629 Merge branch '2.4.x'
Closes gh-24519
4 years ago
Andy Wilkinson a67edfbeb7 Merge branch '2.3.x' into 2.4.x
Closes gh-24518
4 years ago
Andy Wilkinson 76198f9a8d Include properties from test-autoconfigure in config props appendix
Closes gh-24486
4 years ago
Stephane Nicoll 160b20fa49 Merge branch '2.4.x' 4 years ago
Stephane Nicoll c6a64c46b6 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 39751fd692 Merge branch '2.2.x' into 2.3.x
Closes gh-24513
4 years ago
Stephane Nicoll 7194210762 Remove reference to java14 in CI scripts
Closes gh-24472
4 years ago
Andy Wilkinson a52fee83f9 Pick up new minor releases when upgrading dependencies
See gh-24491
4 years ago
Andy Wilkinson fb0f27ce2d Move EMFDependsOnPostProcessor into autoconfigure.orm.jpa
Closes gh-24452
4 years ago
Stephane Nicoll 69c6b6b04d Merge branch '2.4.x'
Closes gh-24511
4 years ago
Stephane Nicoll 251e8b2640 Update instruction to add the configuration processor with Maven
Closes gh-24498
4 years ago
Stephane Nicoll 0dcd9efdac Merge branch '2.4.x'
Closes gh-24509
4 years ago
Stephane Nicoll bf1619e84e Merge pull request #24477 from izeye
* pr/24477:
  Use BindResult.orElseGet() where beneficial

Closes gh-24477
4 years ago
izeye 8e69a821d5 Use BindResult.orElseGet() where beneficial
See gh-24477
4 years ago
Stephane Nicoll 2cabbed1b9 Merge pull request #24114 from vpelikh
* pr/24114:
  Polish "Add Apache Phoenix to supported database drivers"
  Add Apache Phoenix to supported database drivers

Closes gh-24114
4 years ago
Stephane Nicoll 83bdf19934 Polish "Add Apache Phoenix to supported database drivers"
See gh-24114
4 years ago
Vasily Pelikh 305a7d9186 Add Apache Phoenix to supported database drivers
See gh-24114
4 years ago
Stephane Nicoll eb14f067ad Merge pull request #24076 from topikachu
* pr/24076:
  Polish "Add configuration for Rabbit's key store and trust store algorithm"
  Add configuration for Rabbit's key store and trust store algorithm

Closes gh-24076
4 years ago
Stephane Nicoll 59910338c9 Polish "Add configuration for Rabbit's key store and trust store algorithm"
See gh-24076
4 years ago
Gong Yi 489062b203 Add configuration for Rabbit's key store and trust store algorithm
See gh-24076
4 years ago
Phillip Webb 315067b379 Merge branch '2.4.x'
Closes gh-24505
4 years ago
Phillip Webb d1f2aab1e8 Fix non-optional classpath location checking
Allow directory locations that exist but do not contribute properties
to be specified without an `optional:` prefix. This commit fixes logic
introduced in commit 3dc03ac275 which didn't account for the fact that
a directory might contain only profile specific property files and that
profiles might not always be active.

Closes gh-24499
4 years ago
Madhura Bhave edf67e541c Merge branch '2.4.x'
Closes gh-24502
4 years ago
Madhura Bhave 923ddd3479 Update latest GA param for SDKMAN
See gh-24501
4 years ago
Madhura Bhave 5d163ba906 Merge branch '2.3.x' into 2.4.x
Closes gh-24501
4 years ago
Madhura Bhave e5e654c9ee Merge branch '2.2.x' into 2.3.x
Closes gh-24500
4 years ago
Madhura Bhave 822ae0daf7 Fix detection of latest GA for SDKMAN
Fixes gh-24475
4 years ago