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,204 Commits 23 Branches 348 Tags 290 MiB
Commit Graph

35204 Commits

Author SHA1 Message Date
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
Stephane Nicoll 4309b78f02 Upgrade to HttpCore5 5.1.3 
Closes gh-29343
 2022-01-12 14:33:45 +01:00
Stephane Nicoll ca39780ff3 Upgrade to Netty 4.1.73.Final 
Closes gh-29341
 2022-01-12 13:51:24 +01:00
Stephane Nicoll cb1db78c37 Upgrade to Maven Jar Plugin 3.2.2 
Closes gh-29340
 2022-01-12 13:51:23 +01:00
Stephane Nicoll db9097b0d6 Upgrade to Logback 1.2.10 
Closes gh-29339
 2022-01-12 13:51:21 +01:00
Stephane Nicoll d23a665bdc Upgrade to Lettuce 6.1.6.RELEASE 
Closes gh-29338
 2022-01-12 13:51:20 +01:00
Stephane Nicoll 36811f9e1e Upgrade to JBoss Logging 3.4.3.Final 
Closes gh-29337
 2022-01-12 13:51:19 +01:00
Stephane Nicoll 7125bd3779 Upgrade to Jaybird 4.0.5.java8 
Closes gh-29336
 2022-01-12 13:51:18 +01:00
Stephane Nicoll 404fb521ec Upgrade to Infinispan 12.1.11.Final 
Closes gh-29335
 2022-01-12 13:51:17 +01:00
Stephane Nicoll 33da06cff0 Upgrade to HttpCore5 5.1.3 
Closes gh-29334
 2022-01-12 13:51:15 +01:00
Andy Wilkinson e5a110215c Merge branch '2.5.x' into 2.6.x 
Closes gh-29330
 2022-01-12 10:28:47 +00:00
Andy Wilkinson 5744724af2 Merge branch '2.5.x' into 2.6.x 
Closes gh-29329
 2022-01-12 10:28:27 +00:00
Andy Wilkinson ba3842b7a6 Upgrade to Gradle Enterprise plugin 3.8 
Closes gh-29254
 2022-01-12 09:58:57 +00:00
Andy Wilkinson 63e2ccd489 Upgrade to Gradle Enterprise Conventions 0.0.9 
Closes gh-29325
 2022-01-12 09:58:57 +00:00
Stephane Nicoll 8c6f5812a5 Merge branch '2.5.x' into 2.6.x 2022-01-12 09:31:33 +01:00
Stephane Nicoll c32912f05f Start building against Spring Framework 5.3.15 snapshots 
See gh-29327
 2022-01-12 09:30:17 +01:00
Stephane Nicoll b5407e6e8e Start building against Spring Framework 5.3.15 snapshots 
See gh-29326
 2022-01-12 09:29:36 +01:00