AG-3562: fixed spring deps
AG-3594: swinub