Phillip Webb
28cf6f5c59
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29410
3 years ago
Phillip Webb
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
Phillip Webb
0367e13d90
Merge branch '2.7.x'
3 years ago
Phillip Webb
9c481952d8
Remove deprecated convertEnvironment method
3 years ago
Phillip Webb
32e8b30c36
Merge branch '2.7.x'
...
Closes gh-29408
3 years ago
Phillip Webb
9764b3eba0
Change getEnvironment() to return null by default
...
Update the `SpringBootContextLoader.getEnvironment()` method so that it
returns `null` rather than a new `StandardEnvironment`.
Closes gh-29405
3 years ago
Phillip Webb
05a1ef233a
Merge branch '2.7.x'
...
Closes gh-29407
3 years ago
Phillip Webb
c84d3c14fb
Allow test property sources to override command line args
...
Refine `SpringBootContextLoader` logic so that inline test properties
are always added above command line arguments.
Closes gh-29404
3 years ago
Phillip Webb
cb97aff1e7
Merge branch '2.7.x'
3 years ago
Phillip Webb
9278a502c7
Merge branch '2.6.x' into 2.7.x
3 years ago
Phillip Webb
14fe9347b5
Merge branch '2.5.x' into 2.6.x
3 years ago
Phillip Webb
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
Brian Clozel
fe82098d7d
Merge branch '2.7.x'
3 years ago
Brian Clozel
cdee953252
Polish
3 years ago
Brian Clozel
8cc4dffde9
Merge branch '2.7.x'
3 years ago
Brian Clozel
68806bfef8
Fix build after Spring for GraphQL changes
...
See spring-projects/spring-graphql#244
3 years ago
Andy Wilkinson
d60da1cc59
Merge branch '2.7.x'
3 years ago
Andy Wilkinson
b67cc62c37
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29402
3 years ago
Andy Wilkinson
d29a5a2f43
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29401
3 years ago
Andy Wilkinson
e8cbec0836
Clarify documentation of RestTemplate customization
...
Closes gh-29394
3 years ago
Andy Wilkinson
16447e1bce
Merge branch '2.7.x'
3 years ago
Andy Wilkinson
ece4c8ad93
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29400
3 years ago
Andy Wilkinson
8868d34c24
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29399
3 years ago
Andy Wilkinson
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
Stephane Nicoll
61d67a3a3d
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
399c5785c4
Merge branch '2.6.x' into 2.7.x
3 years ago
Stephane Nicoll
1b2fa3cec1
Merge branch '2.5.x' into 2.6.x
3 years ago
Stephane Nicoll
1666b1c284
Upgrade to Neo4j Java Driver 4.4.2
...
Closes gh-29398
3 years ago
Stephane Nicoll
c2fa4ffd7e
Upgrade to SLF4J 1.7.33
...
Closes gh-29397
3 years ago
Stephane Nicoll
afcba76c3c
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29396
3 years ago
Stephane Nicoll
dac4888137
Upgrade to Netty tcNative 2.0.47.Final
...
Closes gh-29395
3 years ago
Stephane Nicoll
af79829cab
Upgrade to Spring Data 2021.1.1
...
Closes gh-29317
3 years ago
Stephane Nicoll
1e44e4e52e
Upgrade to Spring HATEOAS 1.4.1
...
Closes gh-29283
3 years ago
Andy Wilkinson
1ffdfa6c63
Merge pull request #29389 from dsyer
...
* gh-29389:
Polish "Avoid split java.xml packages that cause JDT compile errors"
Avoid split java.xml packages that cause JDT compile errors
Closes gh-29389
3 years ago
Andy Wilkinson
15dafebe0d
Polish "Avoid split java.xml packages that cause JDT compile errors"
...
See gh-29389
3 years ago
Dave Syer
32a6c7df49
Avoid split java.xml packages that cause JDT compile errors
...
Without this change I get compiler errors from JDT in the IDE
(VSCode). It seems to be harmless from the point of view of the
command line build with the JDK.
See gh-29389
3 years ago
Stephane Nicoll
5883b22e01
Upgrade to SLF4J 1.7.33
...
Closes gh-29392
3 years ago
Stephane Nicoll
1e22504d21
Upgrade to R2DBC Bom Arabba-SR12
...
Closes gh-29391
3 years ago
Stephane Nicoll
251f4e8a3f
Upgrade to Spring AMQP 2.3.14
...
Closes gh-29312
3 years ago
Stephane Nicoll
777361421c
Upgrade to Spring Data 2021.0.8
...
Closes gh-29311
3 years ago
Stephane Nicoll
37a44f45a0
Upgrade to Spring HATEOAS 1.3.7
...
Closes gh-29352
3 years ago
Stephane Nicoll
abb88b9aeb
Upgrade to Micrometer 2.0.0-M1
...
Closes gh-29279
3 years ago
Andy Wilkinson
a79cba129f
Remove faulty javadoc styling
...
The styling does not work with Java 17-generated javadoc. Following
Spring Framework's lead, this commit removes the custom styling.
See gh-28101
3 years ago
Stephane Nicoll
9a9cfa78c8
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
77a9d0b6f1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29381
3 years ago
Stephane Nicoll
535254b4ad
Merge pull request #29380 from Omkar-Shetkar
...
* pr/29380:
Fix duplicate "Logging" link
Closes gh-29380
3 years ago
Omkar Shetkar
c19e192acd
Fix duplicate "Logging" link
...
See gh-29380
3 years ago
Stephane Nicoll
2a0b753732
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
b3b72f0869
Merge branch '2.6.x' into 2.7.x
3 years ago
Stephane Nicoll
83c02e4cfa
Merge branch '2.5.x' into 2.6.x
3 years ago