Update post processing and fix JDK7 dependency