Maven support update to 2.3.3