WIKI-156 change version in pom.xml
Use a dedicated version to deploy SNAPSHOT in Nexus from Jenkins
WIKI-156 upgrade version for xwiki to 5.0.2 and add new macroes
WIKI-156 excludes commons-logging in pom.xml
WIKI-626 remove dependencies of Cache macro, Content macro, Comment macro in wiki-webapp/pom.xml
Merge remote-tracking branch 'origin/master' into feature/upgrade-xwiki-5.0.x
WIKI-626 Remove Cache macro, Content macro and Comment macro from xwiki upgrade branch
WIKI-156 / DEP-38 : Update depmgt to version 8 to upgrade version of XWiki to version 5.0.2
Merge branch 'feature/upgrade-xwiki-5.0.x'
fix conflicts after merge feature/update-xwiki-5.0.x to master
Merge branch 'master' into feature/stabilization

Conflicts:
	wiki-webapp/pom.xml