MAJ-1097: change the spring imports