removed unused imports
support both Maven 2 and Maven 3