Modify pom files & fix AAF sonar issues

No match.