pom restructuring
Just a single maven invocation