Merge pull request #29 from apache/refactoring/28-Upgrade-plugins

#28 - Upgrade plugins