diff --git a/examples/spark/pom.xml b/examples/spark/pom.xml
index 1c70ec935b2..ef92e4701d2 100644
--- a/examples/spark/pom.xml
+++ b/examples/spark/pom.xml
@@ -34,6 +34,16 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.10.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>28.0-jre</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.carbondata</groupId>
       <artifactId>carbondata-spark_${spark.binary.version}</artifactId>
diff --git a/integration/spark/src/main/spark2.3/org/apache/spark/sql/hive/CarbonSessionStateBuilder.scala b/integration/spark/src/main/spark2.3/org/apache/spark/sql/hive/CarbonSessionStateBuilder.scala
index 44e556aafbd..dc8503395d0 100644
--- a/integration/spark/src/main/spark2.3/org/apache/spark/sql/hive/CarbonSessionStateBuilder.scala
+++ b/integration/spark/src/main/spark2.3/org/apache/spark/sql/hive/CarbonSessionStateBuilder.scala
@@ -59,8 +59,8 @@ class CarbonHiveSessionCatalog(
     parser: ParserInterface,
     functionResourceLoader: FunctionResourceLoader)
   extends HiveSessionCatalog (
-    externalCatalog,
-    globalTempViewManager,
+    () => externalCatalog,
+    () => globalTempViewManager,
     new HiveMetastoreCatalog(sparkSession),
     functionRegistry,
     conf,
@@ -181,7 +181,7 @@ class CarbonSessionStateBuilder(sparkSession: SparkSession,
    */
   override protected lazy val resourceLoader: HiveSessionResourceLoader = {
     val client: HiveClient = externalCatalog.client.newSession()
-    new HiveSessionResourceLoader(session, client)
+    new HiveSessionResourceLoader(session, () => client)
   }
 
   override protected def analyzer: Analyzer =
diff --git a/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/TableCluster.scala b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/TableCluster.scala
index 1bf4619716c..c124c74d94b 100644
--- a/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/TableCluster.scala
+++ b/mv/plan/src/main/scala/org/apache/carbondata/mv/plans/util/TableCluster.scala
@@ -18,7 +18,7 @@
 package org.apache.carbondata.mv.plans.util
 
 import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty, JsonRawValue}
-import com.google.common.base.Objects
+import com.google.common.base.MoreObjects
 
 class TableCluster @JsonCreator()(@JsonProperty("fact") @JsonRawValue fact: Set[String],
     @JsonProperty("dimension") @JsonRawValue dimension: Set[String]) {
@@ -32,7 +32,7 @@ class TableCluster @JsonCreator()(@JsonProperty("fact") @JsonRawValue fact: Set[
   }
 
   override def toString: String = {
-    Objects.toStringHelper(this)
+    MoreObjects.toStringHelper(this)
       .add("fact", fact)
       .add("dimension", dimension)
       .toString
diff --git a/pom.xml b/pom.xml
index cd21b4d9f45..592bac1a894 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,13 +123,13 @@
     <!--    default properties-->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <snappy.version>1.1.2.6</snappy.version>
-    <hadoop.version>2.7.2</hadoop.version>
+    <hadoop.version>3.1.1.3.1.5.0-152</hadoop.version>
     <httpclient.version>4.3.4</httpclient.version>
     <httpcore.version>4.3-alpha1</httpcore.version>
     <scala.binary.version>2.11</scala.binary.version>
     <scala.version>2.11.8</scala.version>
     <hadoop.deps.scope>compile</hadoop.deps.scope>
-    <spark.version>2.3.4</spark.version>
+    <spark.version>2.3.2.3.1.5.0-152</spark.version>
     <spark.binary.version>2.3</spark.binary.version>
     <spark.deps.scope>compile</spark.deps.scope>
     <scala.deps.scope>compile</scala.deps.scope>
@@ -164,6 +164,15 @@
         <enabled>true</enabled>
       </releases>
     </repository>
+    <repository>
+      <id>hdp</id>
+      <!-- This should be at top, it makes maven try the central repo first and then others and hence faster dep resolution -->
+      <name>hdp Repository</name>
+      <url>https://repo.hortonworks.com/content/groups/public/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
   </repositories>
 
   <dependencyManagement>
@@ -548,7 +557,7 @@
       </activation>
       <properties>
         <spark.binary.version>2.3</spark.binary.version>
-        <spark.version>2.3.4</spark.version>
+        <spark.version>2.3.2.3.1.5.0-152</spark.version>
         <scala.binary.version>2.11</scala.binary.version>
         <scala.version>2.11.8</scala.version>
       </properties>
diff --git a/processing/pom.xml b/processing/pom.xml
index 48bf2c6fa93..1dcd3d1a6a2 100644
--- a/processing/pom.xml
+++ b/processing/pom.xml
@@ -35,6 +35,11 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.htrace</groupId>
+      <artifactId>htrace-core</artifactId>
+      <version>3.1.0-incubating</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.carbondata</groupId>
       <artifactId>carbondata-core</artifactId>