root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
35,670 Commits 23 Branches 348 Tags 290 MiB
Commit Graph

35670 Commits

Author SHA1 Message Date
Phillip Webb 28cf6f5c59 Merge branch '2.5.x' into 2.6.x 
Closes gh-29410
 2022-01-14 20:33:05 -08:00
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
 2022-01-14 20:32:34 -08:00
Phillip Webb 9c481952d8 Remove deprecated convertEnvironment method 2022-01-14 17:38:23 -08:00
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
 2022-01-14 17:35:58 -08:00
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
 2022-01-14 16:30:28 -08:00
Phillip Webb 9278a502c7 Merge branch '2.6.x' into 2.7.x 2022-01-14 13:57:25 -08:00
Phillip Webb 14fe9347b5 Merge branch '2.5.x' into 2.6.x 2022-01-14 13:56:47 -08:00
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
 2022-01-14 13:47:22 -08:00
Brian Clozel cdee953252 Polish 2022-01-14 21:07:29 +01:00
Brian Clozel 68806bfef8 Fix build after Spring for GraphQL changes 
See spring-projects/spring-graphql#244
 2022-01-14 21:05:15 +01:00
Andy Wilkinson b67cc62c37 Merge branch '2.6.x' into 2.7.x 
Closes gh-29402
 2022-01-14 15:55:54 +00:00
Andy Wilkinson d29a5a2f43 Merge branch '2.5.x' into 2.6.x 
Closes gh-29401
 2022-01-14 15:55:41 +00:00
Andy Wilkinson e8cbec0836 Clarify documentation of RestTemplate customization 
Closes gh-29394
 2022-01-14 15:51:08 +00:00
Andy Wilkinson ece4c8ad93 Merge branch '2.6.x' into 2.7.x 
Closes gh-29400
 2022-01-14 15:49:39 +00:00
Andy Wilkinson 8868d34c24 Merge branch '2.5.x' into 2.6.x 
Closes gh-29399
 2022-01-14 15:48:57 +00:00
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
 2022-01-14 15:48:31 +00:00
Stephane Nicoll 399c5785c4 Merge branch '2.6.x' into 2.7.x 2022-01-14 16:22:21 +01:00
Stephane Nicoll 1b2fa3cec1 Merge branch '2.5.x' into 2.6.x 2022-01-14 16:22:10 +01:00
Stephane Nicoll 1666b1c284 Upgrade to Neo4j Java Driver 4.4.2 
Closes gh-29398
 2022-01-14 15:54:48 +01:00
Stephane Nicoll c2fa4ffd7e Upgrade to SLF4J 1.7.33 
Closes gh-29397
 2022-01-14 15:49:56 +01:00
Stephane Nicoll afcba76c3c Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29396
 2022-01-14 15:49:55 +01:00
Stephane Nicoll dac4888137 Upgrade to Netty tcNative 2.0.47.Final 
Closes gh-29395
 2022-01-14 15:49:54 +01:00
Stephane Nicoll af79829cab Upgrade to Spring Data 2021.1.1 
Closes gh-29317
 2022-01-14 15:44:45 +01:00
Stephane Nicoll 1e44e4e52e Upgrade to Spring HATEOAS 1.4.1 
Closes gh-29283
 2022-01-14 15:44:16 +01:00
Stephane Nicoll 5883b22e01 Upgrade to SLF4J 1.7.33 
Closes gh-29392
 2022-01-14 12:21:04 +01:00
Stephane Nicoll 1e22504d21 Upgrade to R2DBC Bom Arabba-SR12 
Closes gh-29391
 2022-01-14 12:21:02 +01:00
Stephane Nicoll 251f4e8a3f Upgrade to Spring AMQP 2.3.14 
Closes gh-29312
 2022-01-14 12:12:00 +01:00
Stephane Nicoll 777361421c Upgrade to Spring Data 2021.0.8 
Closes gh-29311
 2022-01-14 12:11:30 +01:00
Stephane Nicoll 37a44f45a0 Upgrade to Spring HATEOAS 1.3.7 
Closes gh-29352
 2022-01-14 12:10:46 +01:00
Stephane Nicoll 77a9d0b6f1 Merge branch '2.6.x' into 2.7.x 
Closes gh-29381
 2022-01-13 15:31:31 +01:00
Stephane Nicoll 535254b4ad Merge pull request #29380 from Omkar-Shetkar 
* pr/29380:
  Fix duplicate "Logging" link

Closes gh-29380
 2022-01-13 15:31:22 +01:00
Omkar Shetkar c19e192acd Fix duplicate "Logging" link 
See gh-29380
 2022-01-13 15:30:21 +01:00
Stephane Nicoll b3b72f0869 Merge branch '2.6.x' into 2.7.x 2022-01-13 14:43:09 +01:00
Stephane Nicoll 83c02e4cfa Merge branch '2.5.x' into 2.6.x 2022-01-13 14:42:59 +01:00
Stephane Nicoll d82fbcb43b Upgrade to Micrometer 1.9.0-M2 
Closes gh-29282
 2022-01-13 14:40:27 +01:00
Stephane Nicoll 7a0f7c498f Upgrade to Spring Framework 5.3.15 
Closes gh-29328
 2022-01-13 14:39:51 +01:00
Stephane Nicoll 832d8845df Upgrade to Micrometer 1.8.2 
Closes gh-29316
 2022-01-13 14:38:40 +01:00
Stephane Nicoll f65d766fbe Upgrade to Spring Framework 5.3.15 
Closes gh-29327
 2022-01-13 14:38:07 +01:00
Stephane Nicoll aa0a788800 Upgrade to Micrometer 1.7.8 
Closes gh-29310
 2022-01-13 14:36:51 +01:00
Stephane Nicoll 5428106925 Upgrade to Spring Framework 5.3.15 
Closes gh-29326
 2022-01-13 14:36:10 +01:00
Stephane Nicoll 40fa349f3c Merge branch '2.6.x' into 2.7.x 2022-01-13 10:11:52 +01:00
Stephane Nicoll 4a87980180 Merge branch '2.5.x' into 2.6.x 2022-01-13 10:11:43 +01:00
Stephane Nicoll 2cc15dc671 Upgrade CI to Docker 20.10.12 
Closes gh-29361
 2022-01-13 10:11:25 +01:00
Stephane Nicoll d93aeaefa2 Upgrade Ubuntu version in CI images 
Closes gh-29360
 2022-01-13 10:10:50 +01:00
Stephane Nicoll 36aa085a4c Upgrade CI to Docker 20.10.12 
Closes gh-29358
 2022-01-13 10:09:13 +01:00
Stephane Nicoll c4c90a3e7d Upgrade Ubuntu version in CI images 
Closes gh-29359
 2022-01-13 10:08:33 +01:00
Stephane Nicoll a96434467a Upgrade CI to Docker 20.10.12 
Closes gh-29362
 2022-01-13 10:06:59 +01:00
Stephane Nicoll 6695f66045 Upgrade Ubuntu version in CI images 
Closes gh-29363
 2022-01-13 10:06:18 +01:00
Stephane Nicoll 1bf13371c4 Merge branch '2.6.x' into 2.7.x 
Closes gh-29378
 2022-01-13 08:45:59 +01:00
Stephane Nicoll 8384019a41 Merge branch '2.5.x' into 2.6.x 
Closes gh-29377
 2022-01-13 08:45:48 +01:00