Commit Graph

35220 Commits

Author SHA1 Message Date
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
Phillip Webb
27ad0804f5 Update copyright year of changed files 2022-01-12 15:42:25 -08:00
Phillip Webb
91d2b1b988 Merge branch '2.5.x' into 2.6.x
Closes gh-29374
2022-01-12 15:32:00 -08:00
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
2022-01-12 14:21:52 -08:00
Phillip Webb
72696cdb0f Merge branch '2.5.x' into 2.6.x
Closes gh-29371
2022-01-12 14:07:31 -08:00
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
2022-01-12 14:05:30 -08:00
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
2022-01-12 14:03:27 -08:00
Phillip Webb
3ae7c45900 Merge branch '2.5.x' into 2.6.x
Closes gh-29367
2022-01-12 13:54:23 -08:00
Phillip Webb
827309f36f Upgrade to Testcontainers 1.16.2
Closes gh-29366
2022-01-12 13:52:43 -08:00
Stephane Nicoll
2cb889b8e6 Merge branch '2.5.x' into 2.6.x 2022-01-12 15:17:23 +01:00
Stephane Nicoll
ee938cf822 Upgrade to Netty 4.1.73.Final
Closes gh-29351
2022-01-12 14:33:55 +01:00
Stephane Nicoll
d8739c463b Upgrade to MongoDB 4.4.1
Closes gh-29350
2022-01-12 14:33:54 +01:00
Stephane Nicoll
e14c13c75f Upgrade to Maven Jar Plugin 3.2.2
Closes gh-29349
2022-01-12 14:33:52 +01:00
Stephane Nicoll
8cdccb6cb3 Upgrade to Logback 1.2.10
Closes gh-29348
2022-01-12 14:33:51 +01:00
Stephane Nicoll
61e08e3510 Upgrade to Lettuce 6.1.6.RELEASE
Closes gh-29347
2022-01-12 14:33:50 +01:00
Stephane Nicoll
b19593ee47 Upgrade to JBoss Logging 3.4.3.Final
Closes gh-29346
2022-01-12 14:33:49 +01:00
Stephane Nicoll
98118bc480 Upgrade to Jaybird 4.0.5.java8
Closes gh-29345
2022-01-12 14:33:47 +01:00
Stephane Nicoll
838cded308 Upgrade to Infinispan 12.1.11.Final
Closes gh-29344
2022-01-12 14:33:46 +01:00