Moved dependency version numbers to the main POM as suggested by
Kofemann. Other minor cleanup.