#3260 fixed error in the pom that caused incorrect manifest
#3260 re-organized code