Switched to JDK6, too many problems with bundling under jdk7