Maven cleanup
Upgrade XWiki version