Update source to sonar 3.5