Remove -jdk6 suffix