Make maven-plugin use new validation logic