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
Stephane Nicoll
5161e5a5f2
Upgrade to Spring Framework 6.0.0-M2
...
Closes gh-28642
3 years ago
Stephane Nicoll
d82fbcb43b
Upgrade to Micrometer 1.9.0-M2
...
Closes gh-29282
3 years ago
Stephane Nicoll
7a0f7c498f
Upgrade to Spring Framework 5.3.15
...
Closes gh-29328
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
f97d5af467
Upgrade CI to Docker 20.10.12
...
Closes gh-29365
3 years ago
Stephane Nicoll
f8f0c7cc60
Upgrade Ubuntu version in CI images
...
Closes gh-29364
3 years ago
Stephane Nicoll
62cf901cfa
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
40fa349f3c
Merge branch '2.6.x' into 2.7.x
3 years ago
Stephane Nicoll
4a87980180
Merge branch '2.5.x' into 2.6.x
3 years ago
Stephane Nicoll
2cc15dc671
Upgrade CI to Docker 20.10.12
...
Closes gh-29361
3 years ago
Stephane Nicoll
d93aeaefa2
Upgrade Ubuntu version in CI images
...
Closes gh-29360
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
4dac38cb63
Merge branch '2.7.x'
3 years ago
Stephane Nicoll
1bf13371c4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29378
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
13f257a706
Merge branch '2.7.x'
3 years ago
Phillip Webb
8147eb6d6d
Merge branch '2.6.x' into 2.7.x
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
3d6840e715
Merge branch '2.7.x'
...
Closes gh-29376
3 years ago
Phillip Webb
fee45e056a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29375
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
1b7db2750d
Merge branch '2.7.x'
...
Closes gh-29373
3 years ago
Phillip Webb
e1c84e2972
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29372
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
ef9a258174
Merge branch '2.7.x'
...
Closes gh-29369
3 years ago
Phillip Webb
ae4d9ccb2d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29368
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
a714343b90
Merge branch '2.7.x'
3 years ago