Struggling with incompatible changes in maven