Switched to using maven-compat from the same maven version

This is where ArtifactResolver etc. has moved to.

Change-Id: If3c03f145d27b2323cb1afd5e27f59632748c0ff