merge java-common to hmf