Multiple fixes

Use java generics
Fixed typos
Compatibility with 3.1.4.RELEASE : fixed versions and dependencies