root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
36,902 Commits 25 Branches 369 Tags 282 MiB
Commit Graph

36902 Commits

Author SHA1 Message Date
Andy Wilkinson 36f24cf6bb Merge branch '2.7.x' 2022-03-17 19:31:59 +00:00
Andy Wilkinson 3a5a748ec0 Rework Mustache properties to show which are Servlet-specific 
Closes gh-30273
 2022-03-17 19:25:07 +00:00
Andy Wilkinson 6625a77f64 Merge branch '2.7.x' 2022-03-17 17:51:43 +00:00
Andy Wilkinson 2ba064c855 Merge branch '2.6.x' into 2.7.x 
Closes gh-30277
 2022-03-17 17:51:28 +00:00
Andy Wilkinson 3c117ca2d4 Merge branch '2.5.x' into 2.6.x 
Closes gh-30276
 2022-03-17 17:50:58 +00:00
Andy Wilkinson 2b75ea5fb8 Improve testing of spring.mustache.* properties 
Closes gh-30274
 2022-03-17 17:40:22 +00:00
Stephane Nicoll 3afda66be2 Merge branch '2.7.x' 2022-03-17 16:39:36 +01:00
Stephane Nicoll 2631b0ce01 Merge branch '2.6.x' into 2.7.x 
Closes gh-30275
 2022-03-17 16:39:20 +01:00
Stephane Nicoll be34ad36b5 Restore WebSockets section in the reference guide 
Closes gh-30231
 2022-03-17 16:35:04 +01:00
Stephane Nicoll 92e5e91623 Start building against Spring Batch 5.0.0-M2 snapshots 
See gh-30232
 2022-03-17 15:41:18 +01:00
Stephane Nicoll 76f2c81932 Merge branch '2.7.x' 2022-03-17 14:40:15 +01:00
Stephane Nicoll 5c944bf5b8 Upgrade to Spring Framework 6.0.0-M3 
Closes gh-29957
 2022-03-17 14:40:02 +01:00
Moritz Halbritter 29746e1029 Upgrade to Micrometer 2.0.0-M3 
Closes gh-29753
 2022-03-17 14:36:02 +01:00
Stephane Nicoll f92541881a Merge branch '2.6.x' into 2.7.x 2022-03-17 14:34:06 +01:00
Stephane Nicoll 5c197ceae0 Upgrade to Spring Framework 5.3.17 
Closes gh-30188
 2022-03-17 14:33:26 +01:00
Stephane Nicoll 7d1274fdee Merge branch '2.5.x' into 2.6.x 2022-03-17 14:33:08 +01:00
Stephane Nicoll c7e788bd91 Upgrade to Micrometer 1.8.4 
Closes gh-30178
 2022-03-17 14:32:46 +01:00
Stephane Nicoll 947fee1663 Upgrade to Spring Framework 5.3.17 
Closes gh-30177
 2022-03-17 14:32:08 +01:00
Stephane Nicoll 9824d40b14 Upgrade to Micrometer 1.7.10 
Closes gh-30171
 2022-03-17 14:26:09 +01:00
Stephane Nicoll 0bd50fedbc Upgrade to Spring Framework 5.3.17 
Closes gh-30170
 2022-03-17 14:25:23 +01:00
Andy Wilkinson 625ccc7c11 Merge branch '2.7.x' 2022-03-17 12:38:09 +00:00
Andy Wilkinson 4b318a76fa Merge branch '2.6.x' into 2.7.x 
Closes gh-30271
 2022-03-17 12:37:41 +00:00
Andy Wilkinson 0facba1f88 Merge branch '2.5.x' into 2.6.x 
Closes gh-30270
 2022-03-17 12:37:23 +00:00
Andy Wilkinson f342cec5cd Relocate ConnectorStartFailureAnalyzer to remove package tangle 
Closes gh-30268
 2022-03-17 11:48:49 +00:00
Stephane Nicoll 1784fc19bb Adapt mock to API change 2022-03-17 10:34:22 +01:00
Stephane Nicoll ca16ae0804 Merge branch '2.7.x' 2022-03-17 07:58:51 +01:00
Stephane Nicoll 8cb458ce47 Upgrade CI to Docker 20.10.13 
Closes gh-30266
 2022-03-17 07:58:36 +01:00
Stephane Nicoll 8ac3913767 Upgrade Java 18 version in CI image 
Closes gh-30265
 2022-03-17 07:58:12 +01:00
Stephane Nicoll be8b76915c Merge branch '2.6.x' into 2.7.x 2022-03-17 07:57:35 +01:00
Stephane Nicoll 87f4ed13a7 Upgrade CI to Docker 20.10.13 
Closes gh-30263
 2022-03-17 07:57:15 +01:00
Stephane Nicoll 5932a395db Upgrade Java 18 version in CI image 
Closes gh-30261
 2022-03-17 07:56:50 +01:00
Stephane Nicoll 69ae3cc19e Merge branch '2.5.x' into 2.6.x 2022-03-17 07:56:14 +01:00
Stephane Nicoll f79b2f4d88 Upgrade CI to Docker 20.10.13 
Closes gh-30259
 2022-03-17 07:56:03 +01:00
Stephane Nicoll 092e25d232 Upgrade Java 18 version in CI image 
Closes gh-30260
 2022-03-17 07:55:29 +01:00
Stephane Nicoll 531c4af9eb Upgrade CI to Docker 20.10.13 
Closes gh-30264
 2022-03-17 07:54:30 +01:00
Stephane Nicoll ffda0b95ed Upgrade Java 18 version in CI image 
Closes gh-30262
 2022-03-17 07:53:42 +01:00
Andy Wilkinson f3f5a87af4 Merge branch '2.7.x' 2022-03-16 19:42:36 +00:00
Andy Wilkinson fee3b89b1b Merge branch '2.6.x' into 2.7.x 
Closes gh-30257
 2022-03-16 19:42:14 +00:00
Andy Wilkinson cdaafce614 Merge branch '2.5.x' into 2.6.x 
Closes gh-30256
 2022-03-16 19:41:14 +00:00
Andy Wilkinson 7f036e35fd Make MustacheViewResolvers conditional onspring.mustache.enabled 
Closes gh-30250
 2022-03-16 19:09:13 +00:00
Stephane Nicoll 4b4f3be1bf Merge branch '2.7.x' 2022-03-16 18:17:49 +01:00
Stephane Nicoll 626cfff940 Merge branch '2.6.x' into 2.7.x 2022-03-16 18:17:27 +01:00
Stephane Nicoll 8e7f7d3c76 Merge branch '2.5.x' into 2.6.x 2022-03-16 18:17:17 +01:00
Stephane Nicoll b97a3ae07a Revert unnecessary suppress warnings 
See https://github.com/spring-projects/spring-framework/issues/28079
 2022-03-16 18:10:58 +01:00
Andy Wilkinson 09510db630 Merge branch '2.7.x' 2022-03-16 17:07:29 +00:00
Andy Wilkinson 81383e552a Merge branch '2.6.x' into 2.7.x 
Closes gh-30254
 2022-03-16 17:06:43 +00:00
Andy Wilkinson 6bc000565d Merge branch '2.5.x' into 2.6.x 
Closes gh-30253
 2022-03-16 17:06:17 +00:00
Andy Wilkinson 0accc3d67d Convert MustacheAutoConfigurationTests to application context runner 
Closes gh-30252
 2022-03-16 15:28:48 +00:00
Andy Wilkinson 23b5a3f70e Merge branch '2.7.x' 2022-03-16 14:14:35 +00:00
Andy Wilkinson 2282f9cc88 Upgrade to Embedded Mongo 3.4.2 
As part of the upgrade, the property for configuring features has
been removed as support for feature-aware versions has been removed
from Embedded Mongo. For advanced configuration where features were
specified, users should provide a MongodConfig bean instead.

Closes gh-29985
Closes gh-30219
 2022-03-16 14:13:10 +00:00