diff --git a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh
index 15a40f4c..d842449d 100755
--- a/modules/distribution/src/analytics/bin/load-spark-env-vars.sh
+++ b/modules/distribution/src/analytics/bin/load-spark-env-vars.sh
@@ -8,4 +8,10 @@ export SPARK_SCALA_VERSION=2.10
# *** jars will be added to the spark classpath in the code itself. check DAS-105
# export SPARK_CLASSPATH=`java -cp $CARBON_SPARK_HOME/repository/components/plugins/org.wso2.carbon.analytics.spark.utils*.jar org.wso2.carbon.analytics.spark.utils.ComputeClasspath $CARBON_HOME`
# export SPARK_CLASSPATH=$SPARK_CLASSPATH:$(echo $CARBON_SPARK_HOME/repository/components/lib/*.jar | tr ' ' ':')
+export carbon.config.dir.path=$CARBON_HOME/conf
+export carbon.data.dir.path=$CARBON_HOME/repository/data
+export carbon.internal.lib.dir.path=$CARBON_HOME/../lib
+export carbon.external.lib.dir.path=$CARBON_HOME/../../lib
+export carbon.dropins.dir.path=$CARBON_HOME/../../dropins
+export components.repo=$CARBON_HOME/../components/plugins
mkdir -p $CARBON_SPARK_HOME/lib_managed/jars
\ No newline at end of file
diff --git a/modules/distribution/src/analytics/bin/wso2server.sh b/modules/distribution/src/analytics/bin/wso2server.sh
index 5681a3ba..a7109e23 100755
--- a/modules/distribution/src/analytics/bin/wso2server.sh
+++ b/modules/distribution/src/analytics/bin/wso2server.sh
@@ -340,6 +340,7 @@ do
-Dcarbon.extensions.dir.path="$CARBON_HOME/../../extensions" \
-Dcarbon.dropins.dir.path="$CARBON_HOME/../../dropins" \
-Dcarbon.external.lib.dir.path="$CARBON_HOME/../../lib" \
+ -Dcarbon.data.dir.path="$CARBON_HOME/repository/data" \
-Dcarbon.patches.dir.path="$CARBON_HOME/../../patches" \
-Dcarbon.servicepacks.dir.path="$CARBON_HOME/../../servicepacks" \
-Dcarbon.internal.lib.dir.path="$CARBON_HOME/../lib" \
diff --git a/pom.xml b/pom.xml
index 18fb5589..95d41798 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1556,9 +1556,9 @@
4.6.62
- 5.1.33
- 1.3.16
- 1.3.16
+ 5.1.36
+ 1.3.23
+ 1.3.23
${project.version}
3.1.0
3.1.0
@@ -1591,7 +1591,7 @@
2.0.2
- 4.4.41
+ 4.4.43
3.8.1.v20120830-144521
1.0.3
@@ -1643,7 +1643,7 @@
2.8.2.wso2v1
2.0.0.wso2v1
2.0.7
- 2.1.19
+ 2.1.22
[2.6.0,3.0.0)
2.3.4-spark