Swap to Spring Boot 1st draft