Fix following FindBugs analysis and Upgrade

Fix Pom cycle