JAL-2228 java 1.7 compliance