up to java 1.7 and fix file name rolling