Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,636 Commits 23 Branches 0 Tags
15dafebe0d0fffe9d7474c097ad17fca4e7e586d
Commit Graph

35636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
15dafebe0d Polish "Avoid split java.xml packages that cause JDT compile errors" 
See gh-29389
 2022-01-14 12:43:16 +00:00
Dave Syer
32a6c7df49 Avoid split java.xml packages that cause JDT compile errors 
Without this change I get compiler errors from JDT in the IDE
(VSCode). It seems to be harmless from the point of view of the
command line build with the JDK.

See gh-29389
 2022-01-14 12:42:02 +00:00
Stephane Nicoll
abb88b9aeb Upgrade to Micrometer 2.0.0-M1 
Closes gh-29279
 2022-01-14 09:09:17 +01:00
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
 2022-01-13 15:39:34 +00:00
Stephane Nicoll
9a9cfa78c8 Merge branch '2.7.x' 2022-01-13 15:31:38 +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
2a0b753732 Merge branch '2.7.x' 2022-01-13 14:43: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
5161e5a5f2 Upgrade to Spring Framework 6.0.0-M2 
Closes gh-28642
 2022-01-13 14:41:50 +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
f97d5af467 Upgrade CI to Docker 20.10.12 
Closes gh-29365
 2022-01-13 10:13:15 +01:00
Stephane Nicoll
f8f0c7cc60 Upgrade Ubuntu version in CI images 
Closes gh-29364
 2022-01-13 10:12:47 +01:00
Stephane Nicoll
62cf901cfa Merge branch '2.7.x' 2022-01-13 10:12:00 +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
4dac38cb63 Merge branch '2.7.x' 2022-01-13 08:46:08 +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
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
13f257a706 Merge branch '2.7.x' 2022-01-12 15:44:47 -08:00
Phillip Webb
8147eb6d6d Merge branch '2.6.x' into 2.7.x 2022-01-12 15:43:44 -08: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
3d6840e715 Merge branch '2.7.x' 
Closes gh-29376
 2022-01-12 15:32:51 -08:00
Phillip Webb
fee45e056a Merge branch '2.6.x' into 2.7.x 
Closes gh-29375
 2022-01-12 15:32:34 -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
1b7db2750d Merge branch '2.7.x' 
Closes gh-29373
 2022-01-12 14:08:04 -08:00
Phillip Webb
e1c84e2972 Merge branch '2.6.x' into 2.7.x 
Closes gh-29372
 2022-01-12 14:07:48 -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
ef9a258174 Merge branch '2.7.x' 
Closes gh-29369
 2022-01-12 13:54:52 -08:00
Phillip Webb
ae4d9ccb2d Merge branch '2.6.x' into 2.7.x 
Closes gh-29368
 2022-01-12 13:54:39 -08:00