Added better handling for dashes in junitVersion.

* Changed junit version tokenizing from '.' to '.-' to more safely
  handle junit versions with dashes.