Do not use diamond operators (<>).
Now it can be compiled under jdk 6.
Also updated dependencies.