Merge "Migrate to springboot 3"