Fix jdk/axis selection