Revert "switch to jdk6"

This reverts commit 1504f345d1d06bd765e5bc13835db08080498b53.