sync up with API updates; change min jdk version to 1.6 (from parent pom).