Commit Graph

35272 Commits (fb44e1c7c2dc05d9fbc823ad03f3dfc445fe3d46)
 

Author SHA1 Message Date
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
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 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 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
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 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 83c02e4cfa Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 832d8845df Upgrade to Micrometer 1.8.2
Closes gh-29316
3 years ago
Stephane Nicoll f65d766fbe Upgrade to Spring Framework 5.3.15
Closes gh-29327
3 years ago
Stephane Nicoll aa0a788800 Upgrade to Micrometer 1.7.8
Closes gh-29310
3 years ago
Stephane Nicoll 5428106925 Upgrade to Spring Framework 5.3.15
Closes gh-29326
3 years ago
Stephane Nicoll 4a87980180 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 36aa085a4c Upgrade CI to Docker 20.10.12
Closes gh-29358
3 years ago
Stephane Nicoll c4c90a3e7d Upgrade Ubuntu version in CI images
Closes gh-29359
3 years ago
Stephane Nicoll a96434467a Upgrade CI to Docker 20.10.12
Closes gh-29362
3 years ago
Stephane Nicoll 6695f66045 Upgrade Ubuntu version in CI images
Closes gh-29363
3 years ago
Stephane Nicoll 8384019a41 Merge branch '2.5.x' into 2.6.x
Closes gh-29377
3 years ago
Stephane Nicoll a6db1b71cf Merge pull request #29112 from izeye
* pr/29112:
  Update copyright year of changed file
  Polish SpringBootContextLoaderTests

Closes gh-29112
3 years ago
Stephane Nicoll 5f03ace40f Update copyright year of changed file
See gh-29112
3 years ago
izeye 74c522c745 Polish SpringBootContextLoaderTests
See gh-29112
3 years ago
Phillip Webb e7fe371927 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 27ad0804f5 Update copyright year of changed files 3 years ago
Phillip Webb 91d2b1b988 Merge branch '2.5.x' into 2.6.x
Closes gh-29374
3 years ago
Phillip Webb eb6b48fff0 Use side-effect free environment with tests rather than converting
Refine the logic introduced in 64270eca to use a side-effect free
Environment implementation rather than converting the Environment early.

Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.

Fixes gh-29169
3 years ago
Phillip Webb 72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
3 years ago
Phillip Webb 9cf55808fb Ensure run user actually exists
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.

Fixes gh-29370
3 years ago
Phillip Webb 7c16668bf3 Log Docker output to aid debugging
Add an SLF4J logger so that we can see real time output of the
Docker container.

See gh-29370
3 years ago
Phillip Webb 3ae7c45900 Merge branch '2.5.x' into 2.6.x
Closes gh-29367
3 years ago
Phillip Webb 827309f36f Upgrade to Testcontainers 1.16.2
Closes gh-29366
3 years ago
Stephane Nicoll 2cb889b8e6 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll ee938cf822 Upgrade to Netty 4.1.73.Final
Closes gh-29351
3 years ago
Stephane Nicoll d8739c463b Upgrade to MongoDB 4.4.1
Closes gh-29350
3 years ago
Stephane Nicoll e14c13c75f Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29349
3 years ago
Stephane Nicoll 8cdccb6cb3 Upgrade to Logback 1.2.10
Closes gh-29348
3 years ago
Stephane Nicoll 61e08e3510 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29347
3 years ago
Stephane Nicoll b19593ee47 Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29346
3 years ago