Develop pull request from meng

Set JDK version as 1.6