Phillip Webb
2cd1459a9a
Merge pull request #24532 from dreis2211
...
* pr/24532:
Avoid duplicates in MergedContextConfiguration
Closes gh-24532
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
5fdb2ae2fd
Protect PluginApplicationActions against absent plugin classes
...
Closes gh-24526
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
4fba7d0c60
Merge branch '2.3.x' into 2.4.x
4 years ago
Phillip Webb
29300530c6
Polish
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
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
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
Stephane Nicoll
251e8b2640
Update instruction to add the configuration processor with Maven
...
Closes gh-24498
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
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
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
Stephane Nicoll
96510156ae
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24495
4 years ago
Stephane Nicoll
26e7e61919
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24494
4 years ago
Stephane Nicoll
60f526add0
Remove links to Jetty API and documentation
...
This commit removes links to Jetty API and documentation as those links
are breaking every time the Jetty team releases a new version
See https://github.com/eclipse/jetty.project/issues/4546
Closes gh-24493
4 years ago
Stephane Nicoll
8478e86ac2
Merge branch '2.3.x' into 2.4.x
4 years ago
Stephane Nicoll
4f3c7f9e56
Merge branch '2.2.x' into 2.3.x
4 years ago
Stephane Nicoll
40fd71bc05
Switch master branch to 2.5.x
4 years ago
Stephane Nicoll
08b692581a
Prepare 2.4.x branch
4 years ago
Stephane Nicoll
8bab47dacb
Upgrade Java 11 version in CI image
...
Closes gh-24468
4 years ago
Stephane Nicoll
45ddf53d96
Upgrade Java 8 version in CI image
...
Closes gh-24467
4 years ago
Stephane Nicoll
9e6449761c
Upgrade Ubuntu version in CI images
...
Closes gh-24469
4 years ago
Stephane Nicoll
9911bc4420
Upgrade CI to Docker 19.03.14
...
Closes gh-24466
4 years ago
Stephane Nicoll
9a17e6d3bb
Merge branch '2.3.x'
4 years ago
Stephane Nicoll
492df2259b
Upgrade Java 11 version in CI image
...
Closes gh-24463
4 years ago
Stephane Nicoll
c416a40469
Upgrade Java 8 version in CI image
...
Closes gh-24464
4 years ago
Stephane Nicoll
d0b11bdcf4
Upgrade Ubuntu version in CI images
...
Closes gh-24465
4 years ago
Stephane Nicoll
d6f15c3924
Upgrade CI to Docker 19.03.14
...
Close gh-24462
4 years ago
Stephane Nicoll
1b1cdea660
Merge branch '2.2.x' into 2.3.x
4 years ago
Stephane Nicoll
d24bb94c62
Upgrade Java 11 version in CI image
...
Closes gh-24457
4 years ago
Stephane Nicoll
588090994d
Upgrade Java 8 version in CI image
...
Closes gh-24456
4 years ago
Spring Buildmaster
e49962664b
Next development version (v2.4.2-SNAPSHOT)
4 years ago
Stephane Nicoll
0db6891808
Upgrade Ubuntu version in CI images
...
Closes gh-24460
4 years ago
Stephane Nicoll
37e601f128
Upgrade CI to Docker 19.03.14
...
Closes gh-24459
4 years ago
Spring Buildmaster
b638962d36
Next development version (v2.3.8.BUILD-SNAPSHOT)
4 years ago
Phillip Webb
ab0bfa2a76
Merge branch '2.3.x'
4 years ago
Phillip Webb
235f4a7415
Merge branch '2.2.x' into 2.3.x
4 years ago
Phillip Webb
1f8a6ddaaf
Write docker/config.json for CI Image generation
...
See gh-24461
4 years ago
Phillip Webb
f012bd1562
Merge branch '2.3.x'
4 years ago