Andy Wilkinson
ac59b5781f
Align with breaking changes in spring-test
...
See gh-31241
2 years ago
Andy Wilkinson
eca9343675
Merge branch '2.7.x'
2 years ago
Andy Wilkinson
2f01739e0d
Polish since date on new SslStoreProvider API
...
See gh-31253
2 years ago
Andy Wilkinson
543d9c6e66
Merge branch '2.7.x'
2 years ago
Andy Wilkinson
71526bf44f
Polish
...
See gh-31253
2 years ago
Andy Wilkinson
a28ca4594b
Merge branch '2.7.x'
...
Closes gh-31529
2 years ago
Andy Wilkinson
7abc7df7b8
Allow PEM certificates to be used without a key store password
...
Closes gh-31253
2 years ago
Andy Wilkinson
06281e2d72
Merge pull request #31527 from dreis2211
...
* gh-31527:
Use switch expressions where appropriate
Closes gh-31527
2 years ago
dreis2211
458f989cf3
Use switch expressions where appropriate
...
See gh-31527
2 years ago
Andy Wilkinson
836b08f49d
Merge branch '2.7.x'
2 years ago
Andy Wilkinson
dfb8979456
Merge branch '2.6.x' into 2.7.x
2 years ago
Andy Wilkinson
c87340e5c1
Remove unnecessary throws
2 years ago
Andy Wilkinson
631b1e0d76
Merge branch '2.7.x'
...
Closes gh-31526
2 years ago
Andy Wilkinson
1e08f545d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31525
2 years ago
Andy Wilkinson
f49b16c645
Upgrade to Spring Java Format 0.0.34
...
Closes gh-31524
2 years ago
Andy Wilkinson
7c5aacc5f9
Adapt to upstream Spring Framework exception changes
2 years ago
Stephane Nicoll
fe39598e81
Adapt to latest API change in Spring Framework
...
See https://github.com/spring-projects/spring-framework/issues/28585
2 years ago
Andy Wilkinson
114b896e3c
Merge branch '2.7.x'
2 years ago
Andy Wilkinson
a6f11d1f62
Merge branch '2.6.x' into 2.7.x
2 years ago
Spring Builds
da834de4e0
Next development version (v2.7.2-SNAPSHOT)
2 years ago
Spring Builds
53da5e87cc
Next development version (v2.6.10-SNAPSHOT)
2 years ago
Stephane Nicoll
42a437868d
Merge branch '2.7.x'
2 years ago
Stephane Nicoll
498f052a7a
Fix deprecation warning
2 years ago
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