Updating to use latest maven-compat