root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
35,237 Commits 24 Branches 372 Tags 284 MiB
Commit Graph

35237 Commits

Author SHA1 Message Date
Andy Wilkinson 4ee260aa8c Merge branch '2.5.x' into 2.6.x 
Closes gh-29454
 2022-01-18 20:34:51 +00:00
Andy Wilkinson 1c6471ef60 Register AprLifecycleListener with Server not Context 
Fixes gh-28814
 2022-01-18 20:34:08 +00:00
Andy Wilkinson d28942ea53 Merge branch '2.5.x' into 2.6.x 
Closes gh-29449
 2022-01-18 12:00:20 +00:00
Andy Wilkinson 2394cbf650 Merge pull request #29444 from jprinet 
* gh-29444:
  Upgrade to Gradle Enterprise Plugin 3.8.1

Closes gh-29444
 2022-01-18 11:59:54 +00:00
Jerome Prinet 744d977480 Upgrade to Gradle Enterprise Plugin 3.8.1 
See gh-29444
 2022-01-18 11:59:36 +00:00
Andy Wilkinson 27cd1c06a6 Merge branch '2.5.x' into 2.6.x 
Closes gh-29322
 2022-01-17 13:20:29 +00:00
Andy Wilkinson 75187349e8 Upgrade to Spring REST Docs 2.0.6.RELEASE 
Closes gh-29321
 2022-01-17 13:05:15 +00:00
Stephane Nicoll 413fafebff Merge branch '2.5.x' into 2.6.x 2022-01-17 08:53:21 +01:00
Stephane Nicoll a9feb923d7 Update to Spring Kafka 2.8.2 
Closes gh-29319
 2022-01-17 08:44:50 +01:00
Stephane Nicoll 200c05ff98 Upgrade to Spring AMQP 2.4.2 
Closes gh-29318
 2022-01-17 08:44:15 +01:00
Stephane Nicoll e545441f01 Upgrade to Spring Kafka 2.7.10 
Closes gh-29313
 2022-01-17 08:41:47 +01:00
Phillip Webb 6afd9b665d Merge branch '2.5.x' into 2.6.x 2022-01-14 22:56:30 -08:00
Phillip Webb bccc9c1861 Refine ConfigurationPropertySources attach logic 
Refine `ConfigurationPropertySources.attach` logic to endure that
the attached or reattached source is always first.

See gh-29409
 2022-01-14 22:55:26 -08:00
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 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
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 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 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 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 83c02e4cfa Merge branch '2.5.x' into 2.6.x 2022-01-13 14:42:59 +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 4a87980180 Merge branch '2.5.x' into 2.6.x 2022-01-13 10:11:43 +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 8384019a41 Merge branch '2.5.x' into 2.6.x 
Closes gh-29377
 2022-01-13 08:45:48 +01:00
Stephane Nicoll a6db1b71cf Merge pull request #29112 from izeye 
* pr/29112:
  Update copyright year of changed file
  Polish SpringBootContextLoaderTests

Closes gh-29112
 2022-01-13 08:45:29 +01:00
Stephane Nicoll 5f03ace40f Update copyright year of changed file 
See gh-29112
 2022-01-13 08:43:03 +01:00
izeye 74c522c745 Polish SpringBootContextLoaderTests 
See gh-29112
 2022-01-13 08:42:36 +01:00
Phillip Webb e7fe371927 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:43:11 -08:00