Upgrade to springboot 2.5