Fix SPARK-1420 The maven build error for Spark Catalyst