From 2b34b7e7af6d309c9a475787b996110034aa6002 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Fri, 14 Aug 2015 02:38:10 +0530
Subject: [PATCH] update on dependencies

---
 .../pom.xml                                   |   2 +
 .../pom.xml                                   |  18 +--
 .../pom.xml                                   |  24 ++--
 .../pom.xml                                   |  18 +--
 .../pom.xml                                   |  22 ++--
 modules/distribution/src/samples/pom.xml      |  74 ++++++++++++
 .../pom.xml                                   |  23 ++--
 .../distribution/src/samples/sample_pom.xml   | 106 ++++++++++++++----
 .../pom.xml                                   |  18 +--
 9 files changed, 231 insertions(+), 74 deletions(-)

diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
index 8ac9c4bd..f44732a0 100644
--- a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
@@ -113,6 +113,8 @@
 
 
 
+
+
 	</dependencies>
 
 
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
index b09a2a52..86f9f130 100644
--- a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
+++ b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
@@ -21,30 +21,29 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
         </dependency>
 
         <!--CXF -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -56,12 +55,10 @@
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--JAX-RS -->
         <dependency>
@@ -75,12 +72,15 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-web-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient.wso2</groupId>
+            <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
index 7bbdf81a..84a4f546 100644
--- a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
+++ b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
@@ -21,30 +21,30 @@
     <dependency>
       <groupId>org.wso2.carbon.devicemgt</groupId>
       <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wso2.carbon.devicemgt</groupId>
+      <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
     </dependency>
 
     <!--CXF -->
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxws</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
-      <scope>provided</scope>
     </dependency>
     <!--MQTT -->
     <dependency>
       <groupId>org.eclipse.paho</groupId>
       <artifactId>mqtt-client</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <!--IOT -->
@@ -56,12 +56,10 @@
     <dependency>
       <groupId>org.wso2.carbon.device.mgt.iot</groupId>
       <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
       <artifactId>org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl</artifactId>
-      <scope>provided</scope>
     </dependency>
     <!--JAX-RS -->
     <dependency>
@@ -75,12 +73,20 @@
     <dependency>
       <groupId>javax</groupId>
       <artifactId>javaee-web-api</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.ws.rs</groupId>
       <artifactId>jsr311-api</artifactId>
-      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-httpclient.wso2</groupId>
+      <artifactId>commons-httpclient</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
index 5e401386..7a442aa7 100644
--- a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
+++ b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
@@ -21,30 +21,29 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
         </dependency>
 
         <!--CXF -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -56,12 +55,10 @@
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--JAX-RS -->
         <dependency>
@@ -75,12 +72,15 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-web-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient.wso2</groupId>
+            <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
index 7a820177..947cb546 100644
--- a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
+++ b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
@@ -21,30 +21,29 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
         </dependency>
 
         <!--CXF -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -56,12 +55,10 @@
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--JAX-RS -->
         <dependency>
@@ -75,12 +72,19 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-web-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient.wso2</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.utils</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/modules/distribution/src/samples/pom.xml b/modules/distribution/src/samples/pom.xml
index d3e23151..d3e30320 100644
--- a/modules/distribution/src/samples/pom.xml
+++ b/modules/distribution/src/samples/pom.xml
@@ -300,6 +300,79 @@
             </dependency>
 
 
+
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.utils</artifactId>
+                <version>${carbon.kernel.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.bouncycastle.wso2</groupId>
+                        <artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.wso2.carbon</groupId>
+                        <artifactId>org.wso2.carbon.user.api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.wso2.carbon</groupId>
+                        <artifactId>org.wso2.carbon.queuing</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.wso2.carbon</groupId>
+                        <artifactId>org.wso2.carbon.base</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.axis2.wso2</groupId>
+                        <artifactId>axis2</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.igniterealtime.smack.wso2</groupId>
+                        <artifactId>smack</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.igniterealtime.smack.wso2</groupId>
+                        <artifactId>smackx</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>jaxen</groupId>
+                        <artifactId>jaxen</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-fileupload.wso2</groupId>
+                        <artifactId>commons-fileupload</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.ant.wso2</groupId>
+                        <artifactId>ant</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.ant.wso2</groupId>
+                        <artifactId>ant</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-httpclient.wso2</groupId>
+                        <artifactId>commons-httpclient</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.eclipse.equinox</groupId>
+                        <artifactId>javax.servlet</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.wso2.carbon</groupId>
+                        <artifactId>org.wso2.carbon.registry.api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>${google.gson.version}</version>
+            </dependency>
+
+
+
         </dependencies>
     </dependencyManagement>
 
@@ -352,6 +425,7 @@
 
         <commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
+        <google.gson.version>2.3.1</google.gson.version>
 
 
 
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
index 517118ef..10eed88b 100644
--- a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
+++ b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
@@ -21,30 +21,29 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
         </dependency>
 
         <!--CXF -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -56,12 +55,10 @@
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--JAX-RS -->
         <dependency>
@@ -75,12 +72,20 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-web-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient.wso2</groupId>
+            <artifactId>commons-httpclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/modules/distribution/src/samples/sample_pom.xml b/modules/distribution/src/samples/sample_pom.xml
index cfdd8001..f34b0ecd 100644
--- a/modules/distribution/src/samples/sample_pom.xml
+++ b/modules/distribution/src/samples/sample_pom.xml
@@ -36,18 +36,12 @@
 	</parent>
 
 	<modules>
-		<module>firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</module>
-		<module>firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl</module>
-		<module>android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl</module>
-		<module>android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl</module>
-		<module>arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl</module>
-		<module>arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl</module>
-		<module>digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl</module>
-		<module>digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl</module>
-		<module>raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl</module>
-		<module>raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl</module>
-		<module>sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl</module>
-		<module>sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl</module>
+		<module>firealarm/src</module>
+		<module>android_sense/src</module>
+		<module>arduino/src</module>
+		<module>digital_display/src</module>
+		<module>raspberrypi/src</module>
+		<module>sensebot/src</module>
 	</modules>
 
 	<dependencyManagement>
@@ -86,28 +80,30 @@
 			<dependency>
 				<groupId>org.wso2.carbon.devicemgt</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.core</artifactId>
-				<version>${carbon.device.mgt.version}</version>
 				<scope>system</scope>
-				<systemPath>${basedir}/../repository/components/plugins/org.wso2.carbon.device.mgt.core_0.9.2.SNAPSHOT.jar</systemPath>
+				<version>${carbon.device.mgt.version}</version>
+				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.core_0.9.2.SNAPSHOT.jar</systemPath>
 			</dependency>
 			<dependency>
 				<groupId>org.wso2.carbon.devicemgt</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-				<version>${carbon.device.mgt.version}</version>
 				<scope>system</scope>
-				<systemPath>${basedir}/../repository/components/plugins/org.wso2.carbon.device.mgt.common_0.9.2.SNAPSHOT.jar</systemPath>
+				<version>${carbon.device.mgt.version}</version>
+				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.common_0.9.2.SNAPSHOT.jar</systemPath>
 			</dependency>
 
 			<!--IOT dependencies-->
 
+
 			<dependency>
 				<groupId>org.wso2.carbon.device.mgt.iot</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
 				<version>${carbon.iot.device.mgt.version}</version>
 				<scope>system</scope>
-				<systemPath>${basedir}/../repository/components/plugins/org.wso2.carbon.device.mgt.iot.common_1.0.0.SNAPSHOT.jar</systemPath>
+				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot.common_1.0.0.SNAPSHOT.jar</systemPath>
 			</dependency>
 
+
 			<dependency>
 				<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</artifactId>
@@ -204,13 +200,11 @@
 				<groupId>org.codehaus.jackson</groupId>
 				<artifactId>jackson-core-asl</artifactId>
 				<version>${jackson.version}</version>
-				<scope>provided</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.jackson</groupId>
 				<artifactId>jackson-jaxrs</artifactId>
 				<version>${jackson.version}</version>
-				<scope>provided</scope>
 			</dependency>
 
 			<!--Osgi dependencies-->
@@ -308,6 +302,76 @@
 				<scope>provided</scope>
 			</dependency>
 
+			<dependency>
+				<groupId>org.wso2.carbon</groupId>
+				<artifactId>org.wso2.carbon.utils</artifactId>
+				<version>${carbon.kernel.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.bouncycastle.wso2</groupId>
+						<artifactId>bcprov-jdk15on</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.wso2.carbon</groupId>
+						<artifactId>org.wso2.carbon.user.api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.wso2.carbon</groupId>
+						<artifactId>org.wso2.carbon.queuing</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.wso2.carbon</groupId>
+						<artifactId>org.wso2.carbon.base</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.axis2.wso2</groupId>
+						<artifactId>axis2</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.igniterealtime.smack.wso2</groupId>
+						<artifactId>smack</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.igniterealtime.smack.wso2</groupId>
+						<artifactId>smackx</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>jaxen</groupId>
+						<artifactId>jaxen</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>commons-fileupload.wso2</groupId>
+						<artifactId>commons-fileupload</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.ant.wso2</groupId>
+						<artifactId>ant</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.ant.wso2</groupId>
+						<artifactId>ant</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>commons-httpclient.wso2</groupId>
+						<artifactId>commons-httpclient</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.eclipse.equinox</groupId>
+						<artifactId>javax.servlet</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.wso2.carbon</groupId>
+						<artifactId>org.wso2.carbon.registry.api</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
+			<dependency>
+				<groupId>com.google.code.gson</groupId>
+				<artifactId>gson</artifactId>
+				<version>${google.gson.version}</version>
+			</dependency>
+
 
 		</dependencies>
 	</dependencyManagement>
@@ -361,7 +425,7 @@
 
 		<commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
 		<commons-json.version>3.0.0.wso2v1</commons-json.version>
-
+		<google.gson.version>2.3.1</google.gson.version>
 
 
 		<!-- Source code -->
@@ -575,6 +639,8 @@
 			</releases>
 		</repository>
 
+
+
 	</repositories>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
index ea24e700..12abd2ff 100644
--- a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
+++ b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
@@ -21,30 +21,29 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
         </dependency>
 
         <!--CXF -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -56,12 +55,10 @@
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
             <artifactId>org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl</artifactId>
-            <scope>provided</scope>
         </dependency>
         <!--JAX-RS -->
         <dependency>
@@ -75,12 +72,15 @@
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-web-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient.wso2</groupId>
+            <artifactId>commons-httpclient</artifactId>
         </dependency>
     </dependencies>