From 07869a218a6be2a1f63ec0dfec4484819591a1b1 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Wed, 18 Jan 2017 13:24:45 +0530
Subject: [PATCH] Updating the analytics feature used in iot-core to
 1.3.3-SNAPSHOT to resolve the dependancy conflict issue in
 JSServiceConnector.

---
 modules/core/p2-profile-gen/pom.xml | 7 +++++++
 pom.xml                             | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 8856f6a6..e38839e3 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -699,6 +699,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.client.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
                                 <!-- *************** End of DAS Client *************** -->
 
                                 <featureArtifactDef>
@@ -1497,6 +1500,10 @@
                                     <id>org.wso2.carbon.analytics.api.client.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.jsservice.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
                                 <!-- *************** END - DAS Client *************** -->
 
                                 <!-- ************** START - EVENT PROCESSING FEATURES ************ -->
diff --git a/pom.xml b/pom.xml
index 5988444b..e0479d31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1547,7 +1547,7 @@
 
         <!-- Carbon Analytics Common (DAS) -->
         <carbon.analytics.common.version>5.1.5</carbon.analytics.common.version>
-        <carbon.analytics.version>1.3.0</carbon.analytics.version>
+        <carbon.analytics.version>1.3.3-SNAPSHOT</carbon.analytics.version>
         <carbon.analytics.das.version>1.3.0</carbon.analytics.das.version>
         <product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version>
         <product.das.version>3.1.0</product.das.version>