Hi,

second try, but based on 2.2.x. Sorry for the inconveniences.

Cheers, Christoph

Comment From: snicoll

Note when merging forward, use -s ours strategy, see https://github.com/spring-projects/spring-boot/pull/19770#issuecomment-575064128