updated to use latest assembly plugin
(cherry picked from commit 6c234cb)