Change dependency ordering and set spigot dependency to last resolved