Spring security upgrade