Upgrade dependencies
Fix PMD warnings