fix some poms to make 1.12 -> 1.13 merges easier