LPS-48204 Use jdk 6 notation for now