Fixed all modules so that "mvn deploy" works again (for demos, this means skipping the deployment).