Fix divergence between maven generate and Maven push