Fixes #6010: Update build pluing to support Java 7
Merge pull request #15 from fanf/bug_6010/update_build_pluing_to_support_java_7

Fixes #6010: Update build pluing to support Java 7