Revert "Maven"

This reverts commit 9ae6c3fa4c5d86bbae3108d9f13f0d776e0d8dc7.
Revert "Revert "Maven""

This reverts commit 00e5ca95938ff04ec6747564ca81ffb4b7758886.