Revert "Maven assembly plugin update"

This reverts commit 27f6db6e0e52557e9fd5cf1034bfc12aa0d1f152.
Revert "Revert "Maven assembly plugin update""

This reverts commit 3fa7370c7e2b1de30f6fdc939453bf4a5504ecaa.