Upgrade sonar to 4.2 and sonar-java to 2.1