Merge "Update springboot 2.5.10 dependencies"