Merge "[CLAMP] upgrade for java11"