Merge "Use and configure sonar-maven-plugin"