Java 15/17 Migration

- Upgrade spring
