Fix compile problem with jdk 6
Update to surefire 2.16