Merge "Extract version number passed set '{java-version}'"