MapR [SPARK-891] Thrift server start fails due to unsupported Hive Metastore version (apache#837)

Author: Egor Krivokon

conf/spark-defaults.conf

@@ -15,8 +15,4 @@ spark.sql.warehouse.dir            maprfs:///user/${system:user.name}/spark-ware
 # Fix for SPARK-7819
 spark.sql.hive.metastore.sharedPrefixes  com.mysql.jdbc,org.postgresql,com.microsoft.sqlserver,oracle.jdbc,com.mapr.fs.shim.LibraryLoader,com.mapr.security.JNISecurity,com.mapr.fs.jni,com.mapr.fs.ShimLoader
 
-spark.sql.hive.metastore.jars /opt/mapr/spark/spark-3.1.1/jars/*,/opt/mapr/lib/*
-
-spark.sql.hive.metastore.version 2.3
-
 spark.executor.memory              2g

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveUtils.scala

@@ -52,7 +52,7 @@ import org.apache.spark.util.{ChildFirstURLClassLoader, Utils}
 private[spark] object HiveUtils extends Logging {
 
   /** The version of hive used internally by Spark SQL. */
-  val builtinHiveVersion: String = HiveVersionInfo.getVersion
+  val builtinHiveVersion: String = HiveVersionInfo.getShortVersion
 
   val BUILTIN_HIVE_VERSION = buildStaticConf("spark.sql.hive.version")
     .doc("The compiled, a.k.a, builtin Hive version of the Spark distribution bundled with." +