root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
40,722 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

40722 Commits

Author SHA1 Message Date
Andy Wilkinson bb1efe636c Merge branch '2.7.x' 2022-11-28 19:17:11 +00:00
Andy Wilkinson 2da8bc1f3b Reduce Gradle versions used for compatibility testing 
Closes gh-33401
 2022-11-28 19:14:41 +00:00
Andy Wilkinson 92415c996a Fix formatting of NEVER's description 
Closes gh-33398
 2022-11-28 14:17:03 +00:00
Andy Wilkinson c1dab0f9e6 Fix AOT processing of add method with array parameter in Logback model 
Fixes gh-33387
 2022-11-28 14:09:01 +00:00
Moritz Halbritter 012e13527a Fix typo in documentation 2022-11-28 13:39:24 +01:00
Spring Builds 926db2c140 Next development version (v3.0.1-SNAPSHOT) 2022-11-24 17:33:23 +00:00
Andy Wilkinson fb2cc7314d Work around Thymeleaf's dependency on spring-security-bom:6.0.0-RC2 
Closes gh-33348
 2022-11-24 16:49:43 +00:00
Andy Wilkinson 355b428d5d Merge branch '2.7.x' 
Closes gh-33346
 2022-11-24 15:57:37 +00:00
Andy Wilkinson 7ea5881066 Update LATEST_GA to false to prepare for 3.0.0's release 
Closes gh-33345
 2022-11-24 15:51:38 +00:00
Andy Wilkinson 1de09f493f Merge branch '2.6.x' into 2.7.x 2022-11-24 15:51:03 +00:00
Stephane Nicoll e922650877 Upgrade to Spring Framework 6.0.2 
Closes gh-33286
 2022-11-24 15:40:46 +01:00
Spring Builds 4b8a28acdf Next development version (v2.7.7-SNAPSHOT) 2022-11-24 13:21:57 +00:00
Stephane Nicoll 14ba9b18df Start building against Spring Framework 6.0.2 snapshots 
See gh-33286
 2022-11-24 13:19:23 +01:00
Spring Builds d4a91004b5 Next development version (v2.6.15-SNAPSHOT) 2022-11-24 11:57:56 +00:00
Andy Wilkinson 28cb225ac8 Merge branch '2.7.x' 2022-11-24 11:29:47 +00:00
Andy Wilkinson abcbac92ef Merge branch '2.6.x' into 2.7.x 
Closes gh-33343
 2022-11-24 11:29:24 +00:00
Andy Wilkinson ebfbf4a412 Stop testing Gradle plugin against Gradle 7.6 RCs 
Closes gh-33342
 2022-11-24 11:23:45 +00:00
Stephane Nicoll 2b3a236f88 Upgrade to Postgresql 42.5.1 
Closes gh-33340
 2022-11-24 10:05:57 +01:00
Stephane Nicoll 2bbc475469 Upgrade to Caffeine 3.1.2 
Closes gh-33339
 2022-11-24 10:05:54 +01:00
Stephane Nicoll 44e01e50da Merge branch '2.7.x' 2022-11-24 10:03:31 +01:00
Stephane Nicoll 2778e3c6e2 Merge branch '2.6.x' into 2.7.x 2022-11-24 10:03:22 +01:00
Stephane Nicoll 76de7a8024 Upgrade to Postgresql 42.3.8 
Closes gh-33338
 2022-11-24 10:03:18 +01:00
Stephane Nicoll f68e8ce3b4 Upgrade to Postgresql 42.3.8 
Closes gh-33337
 2022-11-24 10:01:14 +01:00
Stephane Nicoll 4d735de591 Upgrade to Spring Batch 5.0.0 
Closes gh-33148
 2022-11-24 09:57:08 +01:00
Moritz Halbritter ad7fe3e3e1 Merge pull request #33335 from ttddyy 
* gh-33335:
  Polish "Document observation for R2DBC"
  Document observation for R2DBC

Closes gh-33335
 2022-11-24 09:21:58 +01:00
Moritz Halbritter 39aaab082b Polish "Document observation for R2DBC" 
See gh-33335
 2022-11-24 09:19:36 +01:00
Tadaya Tsuyukubo 9ddad34f42 Document observation for R2DBC 
Adds a link to the R2DBC observation repo in documentation.

See gh-33335
 2022-11-24 09:17:32 +01:00
Andy Wilkinson e1a407ca9d Upgrade to Micrometer 1.10.2 
Closes gh-33334
 2022-11-23 18:59:46 +00:00
Moritz Halbritter 26db0c7120 Merge branch '2.7.x' 2022-11-23 17:25:07 +01:00
Moritz Halbritter 2170941cf6 Update Kotlin example for Tomcat connector customization 
See gh-33331
 2022-11-23 17:10:36 +01:00
Moritz Halbritter 9af2a5712c Merge branch '2.6.x' into 2.7.x 
Closes gh-33331
 2022-11-23 17:01:19 +01:00
Moritz Halbritter b00f4f926a Create a HTTP connector in the custom tomcat connector example 
Closes gh-28707
 2022-11-23 17:00:08 +01:00
Moritz Halbritter ca358306af Merge branch '2.7.x' 
Closes gh-33329
 2022-11-23 16:33:19 +01:00
Moritz Halbritter d430779f00 Merge branch '2.6.x' into 2.7.x 
Closes gh-33328
 2022-11-23 16:32:19 +01:00
Moritz Halbritter 2f6edecedb Improve JavaDoc on ConditionalOnClass 
Closes gh-27846
 2022-11-23 16:26:43 +01:00
Moritz Halbritter d9aea476b4 Merge branch '2.7.x' 
Closes gh-33327
 2022-11-23 14:23:24 +01:00
Moritz Halbritter 1da3a9d636 Merge branch '2.6.x' into 2.7.x 
Closes gh-33326
 2022-11-23 14:23:08 +01:00
Moritz Halbritter ae8ec86486 Clarify startup probe in actuator documentation 
Closes gh-28432
 2022-11-23 14:21:51 +01:00
Stephane Nicoll 656f109296 Upgrade to Spring Framework 6.0.1 
Closes gh-33286
 2022-11-23 11:52:10 +01:00
Stephane Nicoll 94d8d778ba Merge branch '2.7.x' 2022-11-23 06:13:19 +01:00
Stephane Nicoll 77342a4be4 Merge branch '2.6.x' into 2.7.x 2022-11-23 06:13:05 +01:00
Stephane Nicoll b39f4d7d85 Upgrade to HttpClient5 5.1.4 
Closes gh-33323
 2022-11-23 06:12:51 +01:00
Stephane Nicoll ccd85b7eae Upgrade to Ehcache3 3.10.8 
Closes gh-33322
 2022-11-23 06:12:47 +01:00
Stephane Nicoll 4a792d14c5 Upgrade to Dropwizard Metrics 4.2.13 
Closes gh-33321
 2022-11-23 06:12:43 +01:00
Stephane Nicoll 92ed0dc61e Upgrade to HttpClient5 5.1.4 
Closes gh-33320
 2022-11-23 06:08:49 +01:00
Stephane Nicoll 928d210665 Upgrade to Dropwizard Metrics 4.2.13 
Closes gh-33319
 2022-11-23 06:08:46 +01:00
Brian Clozel 762fb53c21 Upgrade to Spring Session 3.0.0 
Closes gh-33147
 2022-11-22 21:13:43 +01:00
Brian Clozel 07766c436c Apply user-provided ObservationConventions in auto-configurations 
Prior to this commit, we would advise developers, as migration path from
Spring Boot 2.0-x metrics, to create `GlobalObservationConvention` beans
for the observations they want to customize (observation name or key
values).

`GlobalObservationConvention` are currently applied **in addition** to
the chosen convention in some cases, so this does not work well with
this migration path.

Instead, instrumentations always provide a default convention but also a
way to configure a custom convention for their observations. Spring Boot
should inject custom convention beans in the relevant
auto-configurations.

Fixes gh-33285
 2022-11-22 20:44:05 +01:00
Stephane Nicoll f6ac891cc1 Upgrade to Thymeleaf Extras SpringSecurity 3.1.0.RELEASE 
Closes gh-33314
 2022-11-22 18:00:28 +01:00
Stephane Nicoll 47ca1dfe8d Upgrade to Thymeleaf 3.1.0.RELEASE 
Closes gh-33313
 2022-11-22 18:00:28 +01:00