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
30,009 Commits 23 Branches 345 Tags 278 MiB
Commit Graph

30009 Commits

Author SHA1 Message Date
Phillip Webb 315067b379 Merge branch '2.4.x' 
Closes gh-24505
 2020-12-14 20:40:35 -08:00
Phillip Webb d1f2aab1e8 Fix non-optional classpath location checking 
Allow directory locations that exist but do not contribute properties
to be specified without an `optional:` prefix. This commit fixes logic
introduced in commit 3dc03ac275 which didn't account for the fact that
a directory might contain only profile specific property files and that
profiles might not always be active.

Closes gh-24499
 2020-12-14 20:32:13 -08:00
Madhura Bhave edf67e541c Merge branch '2.4.x' 
Closes gh-24502
 2020-12-14 12:16:09 -08:00
Madhura Bhave 923ddd3479 Update latest GA param for SDKMAN 
See gh-24501
 2020-12-14 12:11:57 -08:00
Madhura Bhave 5d163ba906 Merge branch '2.3.x' into 2.4.x 
Closes gh-24501
 2020-12-14 12:11:11 -08:00
Madhura Bhave e5e654c9ee Merge branch '2.2.x' into 2.3.x 
Closes gh-24500
 2020-12-14 12:08:33 -08:00
Madhura Bhave 822ae0daf7 Fix detection of latest GA for SDKMAN 
Fixes gh-24475
 2020-12-14 12:07:15 -08:00
Stephane Nicoll f9e44cd774 Merge branch '2.4.x' 
Closes gh-24496
 2020-12-14 16:20:11 +01:00
Stephane Nicoll 96510156ae Merge branch '2.3.x' into 2.4.x 
Closes gh-24495
 2020-12-14 16:19:50 +01:00
Stephane Nicoll 26e7e61919 Merge branch '2.2.x' into 2.3.x 
Closes gh-24494
 2020-12-14 16:19:23 +01:00
Stephane Nicoll 60f526add0 Remove links to Jetty API and documentation 
This commit removes links to Jetty API and documentation as those links
are breaking every time the Jetty team releases a new version

See https://github.com/eclipse/jetty.project/issues/4546

Closes gh-24493
 2020-12-14 16:17:25 +01:00
Stephane Nicoll 85d0f95f7a Start work on Spring Boot 2.5 
Closes gh-24491
 2020-12-14 14:35:37 +01:00
Stephane Nicoll 4bb99b46ab Merge branch '2.4.x' 2020-12-14 14:35:05 +01:00
Stephane Nicoll 8478e86ac2 Merge branch '2.3.x' into 2.4.x 2020-12-14 14:32:36 +01:00
Stephane Nicoll 4f3c7f9e56 Merge branch '2.2.x' into 2.3.x 2020-12-14 14:32:05 +01:00
Stephane Nicoll 40fd71bc05 Switch master branch to 2.5.x 2020-12-14 14:31:25 +01:00
Stephane Nicoll 08b692581a Prepare 2.4.x branch 2020-12-14 14:22:07 +01:00
Stephane Nicoll 8bab47dacb Upgrade Java 11 version in CI image 
Closes gh-24468
 2020-12-11 09:03:59 +01:00
Stephane Nicoll 45ddf53d96 Upgrade Java 8 version in CI image 
Closes gh-24467
 2020-12-11 09:03:32 +01:00
Stephane Nicoll 9e6449761c Upgrade Ubuntu version in CI images 
Closes gh-24469
 2020-12-11 09:02:53 +01:00
Stephane Nicoll 9911bc4420 Upgrade CI to Docker 19.03.14 
Closes gh-24466
 2020-12-11 09:02:03 +01:00
Stephane Nicoll 9a17e6d3bb Merge branch '2.3.x' 2020-12-11 08:38:22 +01:00
Stephane Nicoll 492df2259b Upgrade Java 11 version in CI image 
Closes gh-24463
 2020-12-11 08:37:50 +01:00
Stephane Nicoll c416a40469 Upgrade Java 8 version in CI image 
Closes gh-24464
 2020-12-11 08:37:08 +01:00
Stephane Nicoll d0b11bdcf4 Upgrade Ubuntu version in CI images 
Closes gh-24465
 2020-12-11 08:36:33 +01:00
Stephane Nicoll d6f15c3924 Upgrade CI to Docker 19.03.14 
Close gh-24462
 2020-12-11 08:35:19 +01:00
Stephane Nicoll 1b1cdea660 Merge branch '2.2.x' into 2.3.x 2020-12-11 08:35:08 +01:00
Stephane Nicoll d24bb94c62 Upgrade Java 11 version in CI image 
Closes gh-24457
 2020-12-11 08:25:24 +01:00
Stephane Nicoll 588090994d Upgrade Java 8 version in CI image 
Closes gh-24456
 2020-12-11 08:24:52 +01:00
Spring Buildmaster e49962664b Next development version (v2.4.2-SNAPSHOT) 2020-12-11 07:24:13 +00:00
Stephane Nicoll 0db6891808 Upgrade Ubuntu version in CI images 
Closes gh-24460
 2020-12-11 08:24:09 +01:00
Stephane Nicoll 37e601f128 Upgrade CI to Docker 19.03.14 
Closes gh-24459
 2020-12-11 08:22:55 +01:00
Spring Buildmaster b638962d36 Next development version (v2.3.8.BUILD-SNAPSHOT) 2020-12-11 06:00:03 +00:00
Phillip Webb ab0bfa2a76 Merge branch '2.3.x' 2020-12-10 21:15:01 -08:00
Phillip Webb 235f4a7415 Merge branch '2.2.x' into 2.3.x 2020-12-10 21:05:31 -08:00
Phillip Webb 1f8a6ddaaf Write docker/config.json for CI Image generation 
See gh-24461
 2020-12-10 21:00:58 -08:00
Phillip Webb f012bd1562 Merge branch '2.3.x' 2020-12-10 18:53:09 -08:00
Phillip Webb 743fedc0ea Merge branch '2.2.x' into 2.3.x 2020-12-10 18:52:31 -08:00
Phillip Webb ff124c0902 Use GitHub token rather than password 
See gh-24458
 2020-12-10 18:51:47 -08:00
Phillip Webb c45600e289 Merge branch '2.3.x' 2020-12-10 18:26:50 -08:00
Phillip Webb 305694e162 Merge branch '2.2.x' into 2.3.x 2020-12-10 18:22:35 -08:00
Phillip Webb babae118fc Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 16:40:44 -08:00
Phillip Webb b953c41a5f Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 16:31:37 -08:00
Phillip Webb 398c6b3603 Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 16:20:37 -08:00
Phillip Webb 615d054dec Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 15:58:19 -08:00
Phillip Webb 6990fff27a Attempt to fix oci-build-task config 
See gh-24197
 2020-12-10 14:35:04 -08:00
Phillip Webb cae5ed81cd Fix README 2020-12-10 14:13:05 -08:00
Phillip Webb c14be4e84b Generate CI images with oci-build-task 
Update CI to generate images using an `oci-build-task` since
the `registry-image` resource cannot perform actual image builds.

See gh-24197
 2020-12-10 14:10:17 -08:00
Phillip Webb fa44a1d0c5 Migrate to registry-image in task yaml 
See gh-24197
 2020-12-10 14:09:55 -08:00
Madhura Bhave f20c3e17f1 Merge branch '2.3.x' 2020-12-10 12:38:59 -08:00