3d46b06e8d
Fix config data placeholder resolution active document logic
...
Update `ConfigDataEnvironmentContributor.isActive` so that unbound
imports are no longer considered active. Prior to this commit, any
`ConfigDataEnvironmentContributor` that had `null` properties was
considered active. This is incorrect for `Kind.UNBOUND_IMPORT`
contributors since we haven't yet bound the `spring.config.*`
properties.
The `ConfigDataEnvironmentContributorPlaceholdersResolver` has been
updated to handle the refined logic. A placeholder can now be resolved
from the current contributor, or from an unbound contributor by binding
it on the fly.
Fixes gh-29386
3 years ago
4ee260aa8c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29454
3 years ago
1c6471ef60
Register AprLifecycleListener with Server not Context
...
Fixes gh-28814
3 years ago
d28942ea53
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29449
3 years ago
2394cbf650
Merge pull request #29444 from jprinet
...
* gh-29444:
Upgrade to Gradle Enterprise Plugin 3.8.1
Closes gh-29444
3 years ago
744d977480
Upgrade to Gradle Enterprise Plugin 3.8.1
...
See gh-29444
3 years ago
27cd1c06a6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29322
3 years ago
75187349e8
Upgrade to Spring REST Docs 2.0.6.RELEASE
...
Closes gh-29321
3 years ago
413fafebff
Merge branch '2.5.x' into 2.6.x
3 years ago
a9feb923d7
Update to Spring Kafka 2.8.2
...
Closes gh-29319
3 years ago
200c05ff98
Upgrade to Spring AMQP 2.4.2
...
Closes gh-29318
3 years ago
e545441f01
Upgrade to Spring Kafka 2.7.10
...
Closes gh-29313
3 years ago
6afd9b665d
Merge branch '2.5.x' into 2.6.x
3 years ago
bccc9c1861
Refine ConfigurationPropertySources attach logic
...
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.
See gh-29409
3 years ago
28cf6f5c59
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29410
3 years ago
79d9549805
Fix ConfigurationPropertySources attach logic
...
Fix `ConfigurationPropertySources.attach` so that repeated calls to the
same source no longer create a new instance.
Fixes gh-29409
3 years ago
14fe9347b5
Merge branch '2.5.x' into 2.6.x
3 years ago
3f7bf7d34f
Modify SpringApplication Environment rather than setting it
...
Update `SpringBootContextLoader` so that when possible the
`SpringApplication` remains in control of creating the `Environment`
instance.
Prior to this commit, we would always create the `Environment` in the
`SpringBootContextLoader` and then call `setEnvironment` on the
`SpringApplication`. This meant that the `ApplicationEnvironment`
classes were not used and that `isCustomEnvironment` was set to `true`
so no conversion was applied.
With the updated code, an `ApplicationListener` is used to mutate the
`Environment` instance and add the required test property sources.
Fixes gh-29169
3 years ago
d29a5a2f43
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29401
3 years ago
e8cbec0836
Clarify documentation of RestTemplate customization
...
Closes gh-29394
3 years ago
8868d34c24
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29399
3 years ago
d051146eb4
Use Testcontainers instead on Embedded Mongo
...
We've seen some problems, particularly on CI, where Embedded Mongo
hangs while trying to start the Mongo process. To limit the problem,
this commit replaces the use of Embedded Mongo with Testcontainers
where we can, leaving Embedded Mongo in use only where we're
specifically testing our Embedded Mongo support.
Closes gh-28843
3 years ago
1b2fa3cec1
Merge branch '2.5.x' into 2.6.x
3 years ago
1666b1c284
Upgrade to Neo4j Java Driver 4.4.2
...
Closes gh-29398
3 years ago
c2fa4ffd7e
Upgrade to SLF4J 1.7.33
...
Closes gh-29397
3 years ago
afcba76c3c
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29396
3 years ago
dac4888137
Upgrade to Netty tcNative 2.0.47.Final
...
Closes gh-29395
3 years ago
af79829cab
Upgrade to Spring Data 2021.1.1
...
Closes gh-29317
3 years ago
1e44e4e52e
Upgrade to Spring HATEOAS 1.4.1
...
Closes gh-29283
3 years ago
5883b22e01
Upgrade to SLF4J 1.7.33
...
Closes gh-29392
3 years ago
1e22504d21
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29391
3 years ago
251f4e8a3f
Upgrade to Spring AMQP 2.3.14
...
Closes gh-29312
3 years ago
777361421c
Upgrade to Spring Data 2021.0.8
...
Closes gh-29311
3 years ago
37a44f45a0
Upgrade to Spring HATEOAS 1.3.7
...
Closes gh-29352
3 years ago
535254b4ad
Merge pull request #29380 from Omkar-Shetkar
...
* pr/29380:
Fix duplicate "Logging" link
Closes gh-29380
3 years ago
c19e192acd
Fix duplicate "Logging" link
...
See gh-29380
3 years ago
83c02e4cfa
Merge branch '2.5.x' into 2.6.x
3 years ago
832d8845df
Upgrade to Micrometer 1.8.2
...
Closes gh-29316
3 years ago
f65d766fbe
Upgrade to Spring Framework 5.3.15
...
Closes gh-29327
3 years ago
aa0a788800
Upgrade to Micrometer 1.7.8
...
Closes gh-29310
3 years ago
5428106925
Upgrade to Spring Framework 5.3.15
...
Closes gh-29326
3 years ago
4a87980180
Merge branch '2.5.x' into 2.6.x
3 years ago
36aa085a4c
Upgrade CI to Docker 20.10.12
...
Closes gh-29358
3 years ago
c4c90a3e7d
Upgrade Ubuntu version in CI images
...
Closes gh-29359
3 years ago
a96434467a
Upgrade CI to Docker 20.10.12
...
Closes gh-29362
3 years ago
6695f66045
Upgrade Ubuntu version in CI images
...
Closes gh-29363
3 years ago
8384019a41
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29377
3 years ago
a6db1b71cf
Merge pull request #29112 from izeye
...
* pr/29112:
Update copyright year of changed file
Polish SpringBootContextLoaderTests
Closes gh-29112
3 years ago
5f03ace40f
Update copyright year of changed file
...
See gh-29112
3 years ago
74c522c745
Polish SpringBootContextLoaderTests
...
See gh-29112
3 years ago
Phillip Webb
Andy Wilkinson
Jerome Prinet
Stephane Nicoll
Omkar Shetkar
izeye