OGM-350 Making sure only Java 6 APIs are used