Upgrade to parent pom 12
Merge commit 'b6c8e7bdb26a0199dbad8baf5d948ec05ec358a1' into HEAD