From 8276ce7dce5184caa26512e3359645376ae0c371 Mon Sep 17 00:00:00 2001
From: lasantha <tcdlpds@gmail.com>
Date: Thu, 15 Mar 2018 00:08:13 +0530
Subject: [PATCH 1/2] Fix Analytics startup issue

---
 .../src/analytics/bin/load-spark-env-vars.sh           |  6 ++++++
 modules/distribution/src/analytics/bin/wso2server.sh   |  1 +
 pom.xml                                                | 10 +++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

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..6b46583e 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/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 @@
         <carbon.mediation.version>4.6.62</carbon.mediation.version>
 
         <!-- Carbon Analytics Common (DAS) -->
-        <carbon.analytics.common.version>5.1.33</carbon.analytics.common.version>
-        <carbon.analytics.version>1.3.16</carbon.analytics.version>
-        <carbon.analytics.das.version>1.3.16</carbon.analytics.das.version>
+        <carbon.analytics.common.version>5.1.36</carbon.analytics.common.version>
+        <carbon.analytics.version>1.3.23</carbon.analytics.version>
+        <carbon.analytics.das.version>1.3.23</carbon.analytics.das.version>
         <product.iot.analytics.version>${project.version}</product.iot.analytics.version>
         <product.das.version>3.1.0</product.das.version>
         <product.mb.version>3.1.0</product.mb.version>
@@ -1591,7 +1591,7 @@
 
         <!--IOT Analytics-->
         <shindig.version>2.0.2</shindig.version>
-        <carbon.data.version>4.4.41</carbon.data.version>
+        <carbon.data.version>4.4.43</carbon.data.version>
         <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
         <analytics.shared.version>1.0.3</analytics.shared.version>
 
@@ -1643,7 +1643,7 @@
         <orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
         <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
         <carbon.dashboard.version>2.0.7</carbon.dashboard.version>
-        <carbon.event-processing.version>2.1.19</carbon.event-processing.version>
+        <carbon.event-processing.version>2.1.22</carbon.event-processing.version>
         <imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
         <akka.version>2.3.4-spark</akka.version>
 

From a224a9d16ad5d6aa23af7588da2b95fe63ca1a59 Mon Sep 17 00:00:00 2001
From: lasantha <tcdlpds@gmail.com>
Date: Thu, 15 Mar 2018 00:14:04 +0530
Subject: [PATCH 2/2] Fix data folder path issue

---
 modules/distribution/src/analytics/bin/wso2server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/distribution/src/analytics/bin/wso2server.sh b/modules/distribution/src/analytics/bin/wso2server.sh
index 6b46583e..a7109e23 100755
--- a/modules/distribution/src/analytics/bin/wso2server.sh
+++ b/modules/distribution/src/analytics/bin/wso2server.sh
@@ -340,7 +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/data" \
+    -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" \