Upgrade to parent pom 16