HAP-456 - fixed support for Maven 2