Stephane Nicoll
11930724f8
Merge branch '2.7.x'
2 years ago
Stephane Nicoll
bc2d20edf0
Merge branch '2.6.x' into 2.7.x
2 years ago
Stephane Nicoll
a94e7d6672
Upgrade to Jetty 9.4.48.v20220622
...
Closes gh-31509
2 years ago
Stephane Nicoll
5976457271
Upgrade to Byte Buddy 1.12.11
...
Closes gh-31508
2 years ago
Stephane Nicoll
6484be2aa5
Upgrade to Jetty 9.4.48.v20220622
...
Closes gh-31507
2 years ago
Phillip Webb
2c22f21835
Merge branch '2.7.x'
...
Closes gh-31504
2 years ago
Phillip Webb
28775c2c53
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31503
2 years ago
Phillip Webb
9e98f694c7
Merge pull request #31238 from ittays
...
* pr/31238:
Polish 'Allow spring.data.cassandra.config file to override default values'
Allow spring.data.cassandra.config file to override default values
Closes gh-31238
2 years ago
Phillip Webb
904feb2490
Polish 'Allow spring.data.cassandra.config file to override default values'
...
See gh-31238
2 years ago
Stern, Ittay (is9613)
1c7d99890e
Allow spring.data.cassandra.config file to override default values
...
Update `CassandraAutoConfiguration` so that properties in a
`spring.data.cassandra.config` file can override the default values
defined in `CassandraProperties`.
This commit changes two things:
1. Any primitive on `CassandraProperties` are replaced with object values.
This allows distinguishing between defaults values and no-values. Then
CassandraAutoConfiguration.mapConfig() can use whenNonNull() predicate
to ignore those.
2. `CassandraProperties` no longer populate default values on any
property. With that, the defaults can be applied on top of the file
spring.data.cassandra.config; i.e. the config file have higher
precedence than the defaults, but lower that any spring.data.cassandra.*
property.
See gh-31238
2 years ago
Phillip Webb
e6352eee32
Fix import that should have been replaced during merge
...
See gh-31502
2 years ago
Phillip Webb
b85469a5a5
Merge branch '2.7.x'
...
Closes gh-31502
2 years ago
Phillip Webb
d64f601dfd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31501
2 years ago
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
2 years ago
Phillip Webb
aed4c47adb
Polish CompositeHandlerExceptionResolver
...
See gh-31495
2 years ago
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
2 years ago
Madhura Bhave
7cb53b3c45
Remove session store type in favor of defined order
...
Closes gh-27756
2 years ago
Andy Wilkinson
6346f21f4e
Merge branch '2.7.x'
2 years ago
Andy Wilkinson
7fcdd9ffd0
Merge branch '2.6.x' into 2.7.x
2 years ago
Andy Wilkinson
a784156f66
Revert "Start building against Spring Session 2021.1.4 snapshots"
...
This reverts commit 2f40c52d81
.
2 years ago
Andy Wilkinson
ed75930dc7
Merge branch '2.7.x'
2 years ago
Andy Wilkinson
83932cfe94
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31483
2 years ago
Andy Wilkinson
17c757c600
Upgrade to Spring Integration 5.5.13
...
Closes gh-31482
2 years ago
Andy Wilkinson
a55560669b
Remove YamlJsonParser
...
Closes gh-31498
2 years ago
Andy Wilkinson
b07d5b0bb1
Merge branch '2.7.x'
...
Closes gh-31500
2 years ago
Andy Wilkinson
268f13dbd7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31499
2 years ago
Andy Wilkinson
522ea0a90e
Handle malformed JSON more consistently
...
Closes gh-31301
2 years ago
Andy Wilkinson
c9e0e8891f
Make reactive user details back off with Auth Manager Resolver bean
...
Closes gh-31317
2 years ago
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
2 years ago
Moritz Halbritter
bb6c56e5f0
Polish "Add WebClient based sender for Zipkin"
...
See gh-30792
2 years ago
StefanBratanov
12037bd131
Add WebClient based sender for Zipkin
...
See gh-30792
2 years ago
Stephane Nicoll
03b742c655
Merge branch '2.7.x'
2 years ago
Stephane Nicoll
e967d0383b
Merge branch '2.6.x' into 2.7.x
2 years ago
Stephane Nicoll
79d3e3080f
Polish
2 years ago
Stephane Nicoll
39680beb10
Merge branch '2.7.x'
2 years ago
Stephane Nicoll
2176e5a44c
Merge branch '2.6.x' into 2.7.x
2 years ago
Stephane Nicoll
f27adeb241
Upgrade to Solr 8.11.2
...
Closes gh-31491
2 years ago
Stephane Nicoll
4f6bc3c2e0
Upgrade to Kotlin Coroutines 1.6.3
...
Closes gh-31490
2 years ago
Stephane Nicoll
7266dd5270
Upgrade to Jetty 9.4.47.v20220610
...
Closes gh-31489
2 years ago
Stephane Nicoll
296e88db51
Upgrade to Dropwizard Metrics 4.2.10
...
Closes gh-31488
2 years ago
Stephane Nicoll
72257ba302
Upgrade to Jetty 9.4.47.v20220610
...
Closes gh-31487
2 years ago
Stephane Nicoll
e74163704c
Upgrade to Dropwizard Metrics 4.2.10
...
Closes gh-31486
2 years ago
Stephane Nicoll
0a54b23e9e
Merge branch '2.7.x'
2 years ago
Stephane Nicoll
2665880abe
Merge branch '2.6.x' into 2.7.x
2 years ago
Stephane Nicoll
1c2e3b731b
Upgrade to Spring Kafka 2.8.7
...
Closes gh-31377
2 years ago
Stephane Nicoll
09cd024817
Upgrade to Spring Kafka 2.8.7
...
Closes gh-31350
2 years ago
Phillip Webb
e77f137a32
Merge branch '2.7.x'
...
Closes gh-31485
2 years ago
Phillip Webb
13b2de3bb8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31484
2 years ago
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
2 years ago
Phillip Webb
f4a48ae312
Merge branch '2.7.x'
2 years ago