Fixup pom after merges
Use parent v12