Change analytics version and databridge

components/device-mgt-iot/org.wso2.carbon.device.mgt.iot/pom.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
@@ -133,10 +132,6 @@
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.logging</artifactId>
         </dependency>
-    <dependency>
-      <groupId>org.wso2.carbon</groupId>
-      <artifactId>org.wso2.carbon.utils</artifactId>
-    </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
@@ -167,6 +162,10 @@
             <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.json.wso2</groupId>
@@ -198,8 +197,12 @@
             <artifactId>commons-configuration</artifactId>
         </dependency>
         <dependency>
-      <groupId>org.wso2.carbon.commons</groupId>
+            <groupId>org.wso2.carbon.analytics-common</groupId>
-      <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
+            <artifactId>org.wso2.carbon.databridge.agent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.analytics-common</groupId>
+            <artifactId>org.wso2.carbon.databridge.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.commons</groupId>
@@ -216,8 +219,8 @@
         </dependency>
 
         <dependency>
-      <groupId>org.wso2.carbon.devicemgt</groupId>
+            <groupId>org.wso2.carbon</groupId>
-      <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
+            <artifactId>org.wso2.carbon.utils</artifactId>
         </dependency>
 
         <!--Dependencies on XMPP Client Library-->

pom.xml

@@ -284,15 +284,20 @@
                 <scope>provided</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.commons</groupId>
+                <groupId>org.wso2.carbon.analytics-common</groupId>
-                <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
+                <artifactId>org.wso2.carbon.databridge.core</artifactId>
-                <version>${carbon.commons.version}</version>
+                <version>${carbon.analytics.common.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.commons</groupId>
                 <artifactId>org.wso2.carbon.databridge.commons</artifactId>
                 <version>${carbon.commons.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.analytics-common</groupId>
+                <artifactId>org.wso2.carbon.databridge.agent</artifactId>
+                <version>${carbon.analytics.common.version}</version>
+            </dependency>
 
             <!--IoT Server specific dependencies-->
 
@@ -1043,8 +1048,11 @@
         <smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>
         <eclipse.paho.version>0.4.0</eclipse.paho.version>
 
-        <!--carbon analytics dependencies-->
+        <!--Carbon Analytics-->
-        <carbon.analytics.version>1.0.3</carbon.analytics.version>
+        <carbon.analytics.common.version>5.0.5</carbon.analytics.common.version>
+        <carbon.analytics.common.version.range>[5.0.5,6.0.0)</carbon.analytics.common.version.range>
+        <carbon.analytics.version>1.0.4</carbon.analytics.version>
+        <carbon.analytics.version.range>[1.0.4,2.0.0]</carbon.analytics.version.range>
 
         <!-- Third Party Dependencies-->
         <spongycastle.version>1.51.0.0</spongycastle.version>