Commit Graph

38505 Commits

Author SHA1 Message Date
Phillip Webb
e6352eee32 Fix import that should have been replaced during merge
See gh-31502
2022-06-22 16:55:50 -07:00
Phillip Webb
b85469a5a5 Merge branch '2.7.x'
Closes gh-31502
2022-06-22 16:33:42 -07:00
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
Madhura Bhave
7cb53b3c45 Remove session store type in favor of defined order
Closes gh-27756
2022-06-22 15:22:48 -07:00
Andy Wilkinson
6346f21f4e Merge branch '2.7.x' 2022-06-22 21:13:59 +01: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
ed75930dc7 Merge branch '2.7.x' 2022-06-22 21:00:34 +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
a55560669b Remove YamlJsonParser
Closes gh-31498
2022-06-22 20:20:28 +01:00
Andy Wilkinson
b07d5b0bb1 Merge branch '2.7.x'
Closes gh-31500
2022-06-22 19:50:01 +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
Andy Wilkinson
c9e0e8891f Make reactive user details back off with Auth Manager Resolver bean
Closes gh-31317
2022-06-22 10:41:54 +01:00
Moritz Halbritter
611b029a73 Merge pull request #30792 from StefanBratanov
* gh-30792:
  Polish "Add WebClient based sender for Zipkin"
  Add WebClient based sender for Zipkin

Closes gh-30792
2022-06-22 10:25:55 +02:00
Moritz Halbritter
bb6c56e5f0 Polish "Add WebClient based sender for Zipkin"
See gh-30792
2022-06-22 10:25:18 +02:00
StefanBratanov
12037bd131 Add WebClient based sender for Zipkin
See gh-30792
2022-06-22 09:58:05 +02:00
Stephane Nicoll
03b742c655 Merge branch '2.7.x' 2022-06-22 08:17:13 +02: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
39680beb10 Merge branch '2.7.x' 2022-06-22 08:14:43 +02:00
Stephane Nicoll
2176e5a44c Merge branch '2.6.x' into 2.7.x 2022-06-22 08:13:24 +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
0a54b23e9e Merge branch '2.7.x' 2022-06-22 07:52:35 +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
e77f137a32 Merge branch '2.7.x'
Closes gh-31485
2022-06-21 19:10:37 -07: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
f4a48ae312 Merge branch '2.7.x' 2022-06-21 12:09:01 -07:00
Phillip Webb
4c0a4cb669 Polish 2022-06-21 12:08:03 -07:00
Andy Wilkinson
2c1301b241 Merge pull request #31477 from dreis2211
* gh-31477:
  Polish "Use java.util.HexFormat where appropriate"
  Use java.util.HexFormat where appropriate

Closes gh-31477
2022-06-21 17:40:54 +01:00
Andy Wilkinson
965fbf4494 Polish "Use java.util.HexFormat where appropriate"
See gh-31477
2022-06-21 17:03:26 +01:00
dreis2211
cc91009b70 Use java.util.HexFormat where appropriate
See gh-31477
2022-06-21 17:02:39 +01:00
Andy Wilkinson
76cd2466ac Merge branch '2.7.x' 2022-06-21 16:37:17 +01:00
Andy Wilkinson
390554a84f Upgrade to Spring AMQP 2.4.6
Closes gh-31376
2022-06-21 16:36:55 +01:00
Andy Wilkinson
d5255142ef Merge branch '2.7.x' 2022-06-21 16:36:24 +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
bc931cb32c Revert "Polish EndpointRequest"
This reverts commit 35997a30a3.
2022-06-21 15:43:57 +02:00