* simplify poms, add back missing changes from #7850 * remove non used plugin, missing from #7687 Signed-off-by: Olivier Lamy <olamy@apache.org>