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

37356 Commits

Author SHA1 Message Date
Phillip Webb d64f601dfd Merge branch '2.6.x' into 2.7.x 
Closes gh-31501
 2022-06-22 16:31:52 -07:00
Phillip Webb 7017e103f6 Merge pull request #31495 from terminux 
* pr/31495:
  Polish CompositeHandlerExceptionResolver
  Use ExceptionHandler when Spring MVC uses a different management port

Closes gh-31495
 2022-06-22 16:31:28 -07:00
Phillip Webb aed4c47adb Polish CompositeHandlerExceptionResolver 
See gh-31495
 2022-06-22 16:23:38 -07:00
Guirong Hu 3592292e4b Use ExceptionHandler when Spring MVC uses a different management port 
Update `CompositeHandlerExceptionResolver` to search for beans in
all contexts. Note that `BeanFactoryUtils.beansOfTypeIncludingAncestors`
cannot not be used since we need to pick up all beans, even if they
have the same name.

See gh-31495
 2022-06-22 16:13:26 -07:00
Andy Wilkinson 7fcdd9ffd0 Merge branch '2.6.x' into 2.7.x 2022-06-22 21:13:43 +01:00
Andy Wilkinson a784156f66 Revert "Start building against Spring Session 2021.1.4 snapshots" 
This reverts commit 2f40c52d81.
 2022-06-22 21:13:18 +01:00
Andy Wilkinson 83932cfe94 Merge branch '2.6.x' into 2.7.x 
Closes gh-31483
 2022-06-22 20:54:56 +01:00
Andy Wilkinson 17c757c600 Upgrade to Spring Integration 5.5.13 
Closes gh-31482
 2022-06-22 20:38:19 +01:00
Andy Wilkinson 268f13dbd7 Merge branch '2.6.x' into 2.7.x 
Closes gh-31499
 2022-06-22 19:49:38 +01:00
Andy Wilkinson 522ea0a90e Handle malformed JSON more consistently 
Closes gh-31301
 2022-06-22 18:31:16 +01:00
Stephane Nicoll e967d0383b Merge branch '2.6.x' into 2.7.x 2022-06-22 08:16:18 +02:00
Stephane Nicoll 79d3e3080f Polish 2022-06-22 08:15:04 +02:00
Stephane Nicoll f27adeb241 Upgrade to Solr 8.11.2 
Closes gh-31491
 2022-06-22 08:03:53 +02:00
Stephane Nicoll 4f6bc3c2e0 Upgrade to Kotlin Coroutines 1.6.3 
Closes gh-31490
 2022-06-22 08:03:51 +02:00
Stephane Nicoll 7266dd5270 Upgrade to Jetty 9.4.47.v20220610 
Closes gh-31489
 2022-06-22 08:03:47 +02:00
Stephane Nicoll 296e88db51 Upgrade to Dropwizard Metrics 4.2.10 
Closes gh-31488
 2022-06-22 08:03:45 +02:00
Stephane Nicoll 72257ba302 Upgrade to Jetty 9.4.47.v20220610 
Closes gh-31487
 2022-06-22 07:55:16 +02:00
Stephane Nicoll e74163704c Upgrade to Dropwizard Metrics 4.2.10 
Closes gh-31486
 2022-06-22 07:55:14 +02:00
Stephane Nicoll 2665880abe Merge branch '2.6.x' into 2.7.x 2022-06-22 07:52:24 +02:00
Stephane Nicoll 1c2e3b731b Upgrade to Spring Kafka 2.8.7 
Closes gh-31377
 2022-06-22 07:52:14 +02:00
Stephane Nicoll 09cd024817 Upgrade to Spring Kafka 2.8.7 
Closes gh-31350
 2022-06-22 07:51:32 +02:00
Phillip Webb 13b2de3bb8 Merge branch '2.6.x' into 2.7.x 
Closes gh-31484
 2022-06-21 19:10:23 -07:00
Phillip Webb 7fc9debf2a Consider super classes when detecting nested property classes 
Update `PropertyDescriptor.isParentTheSame` to consider the candidate
as well as all super classes.

Fixes gh-21626
 2022-06-21 19:09:32 -07:00
Phillip Webb 4c0a4cb669 Polish 2022-06-21 12:08:03 -07:00
Andy Wilkinson 390554a84f Upgrade to Spring AMQP 2.4.6 
Closes gh-31376
 2022-06-21 16:36:55 +01:00
Andy Wilkinson f055d564f4 Merge branch '2.6.x' into 2.7.x 2022-06-21 16:36:03 +01:00
Andy Wilkinson 49fd727ef0 Upgrade to Spring AMQP 2.4.6 
Closes gh-31348
 2022-06-21 16:34:47 +01:00
Moritz Halbritter ae75d4386c Merge branch '2.6.x' into 2.7.x 2022-06-21 14:01:18 +02:00
Moritz Halbritter b56b95d429 Add Apache HttpClient WebClient support to documentation 2022-06-21 14:00:55 +02:00
Andy Wilkinson 25b6cc0e74 Merge branch '2.6.x' into 2.7.x 2022-06-20 20:46:56 +01:00
Andy Wilkinson d45e42f2e1 Upgrade to Spring Security 5.6.6 
Closes gh-31351
 2022-06-20 20:46:38 +01:00
Andy Wilkinson 79580617a6 Upgrade to Spring Security 5.7.2 
Closes gh-31375
 2022-06-20 20:33:56 +01:00
Andy Wilkinson a0839a702d Merge branch '2.6.x' into 2.7.x 
Closes gh-31473
 2022-06-20 15:59:19 +01:00
Andy Wilkinson bf1beb8794 Merge pull request #31462 from jprinet 
* gh-31462:
  Upgrade to Gradle Enterprise plugin 3.10.2

Closes gh-31462
 2022-06-20 15:59:10 +01:00
Jerome Prinet c531bd33e2 Upgrade to Gradle Enterprise plugin 3.10.2 
See gh-31462
 2022-06-20 15:58:24 +01:00
Andy Wilkinson 878d09fe79 Merge branch '2.6.x' into 2.7.x 
Closes gh-31471
 2022-06-20 15:56:58 +01:00
Andy Wilkinson 2a01473ba9 Upgrade to Gradle Enterprise Conventions 0.0.10 
Closes gh-31470
 2022-06-20 15:56:31 +01:00
Stephane Nicoll 4445ac45c4 Merge pull request #31463 from sdeleuze 
* pr/31463:
  Make SpringApplication Kotlin samples idiomatic

Closes gh-31463
 2022-06-20 14:38:53 +02:00
Sébastien Deleuze b5d380c1cb Make SpringApplication Kotlin samples idiomatic 
See gh-31463
 2022-06-20 14:38:43 +02:00
Stephane Nicoll 21f98b042b Merge branch '2.6.x' into 2.7.x 2022-06-20 14:38:01 +02:00
Stephane Nicoll c04b407913 Upgrade to Spring Data 2021.2.1 
Closes gh-31374
 2022-06-20 14:22:25 +02:00
Stephane Nicoll 4f78f9556d Upgrade to Spring HATEOAS 1.5.1 
Closes gh-31465
 2022-06-20 14:21:48 +02:00
Stephane Nicoll 46a5e5d9d4 Upgrade to Spring Data 2021.1.5 
Closes gh-31349
 2022-06-20 14:19:53 +02:00
Stephane Nicoll 87ecbc7073 Upgrade to Spring HATEOAS 1.4.4 
Closes gh-31464
 2022-06-20 14:19:17 +02:00
Stephane Nicoll a037ce14a7 Merge pull request #31458 from ningenMe 
* pr/31458:
  Polish "Harmonize Kotlin example"
  Harmonize Kotlin example

Closes gh-31458
 2022-06-20 10:34:52 +02:00
Stephane Nicoll 8b9579eeb7 Polish "Harmonize Kotlin example" 
See gh-31458
 2022-06-20 10:33:34 +02:00
ningenMe 6685d49faa Harmonize Kotlin example 
See gh-31458
 2022-06-20 10:27:04 +02:00
Stephane Nicoll cd383474cd Merge pull request #31453 from izeye 
* pr/31453:
  Polish OAuth2ResourceServerAutoConfigurationTests

Closes gh-31453
 2022-06-19 10:15:08 +02:00
Johnny Lim 11a07a9d1e Polish OAuth2ResourceServerAutoConfigurationTests 
See gh-31453
 2022-06-19 10:11:48 +02:00
Andy Wilkinson f68d051fc0 Merge branch '2.6.x' into 2.7.x 
See gh-31286
 2022-06-17 14:33:40 +01:00