diff --git a/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
index 450db516..cc0e34c8 100644
--- a/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
+++ b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
@@ -21,12 +21,10 @@
         <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>
-            <scope>provided</scope>
         </dependency>
 
         <!--CXF -->
@@ -49,7 +47,6 @@
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -61,7 +58,6 @@
         <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>
@@ -109,4 +105,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
index dfbf4e46..d490c2da 100644
--- a/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
+++ b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
@@ -21,12 +21,10 @@
         <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>
-            <scope>provided</scope>
         </dependency>
 
         <!--CXF -->
@@ -49,7 +47,6 @@
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -61,7 +58,6 @@
         <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>
diff --git a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
index f591305f..e7bf5580 100644
--- a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
+++ b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
@@ -21,12 +21,10 @@
         <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>
-            <scope>provided</scope>
         </dependency>
 
         <!--CXF -->
@@ -49,7 +47,6 @@
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -61,7 +58,6 @@
         <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>
@@ -90,18 +86,15 @@
         <dependency>
             <groupId>commons-httpclient.wso2</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.utils</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
-            <scope>provided</scope>
         </dependency>
 
     </dependencies>
diff --git a/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
index 6891f148..5ffc5a1f 100644
--- a/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
+++ b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
@@ -21,12 +21,10 @@
         <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>
-            <scope>provided</scope>
         </dependency>
 
         <!--CXF -->
@@ -49,7 +47,6 @@
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -90,7 +87,6 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
-            <scope>provided</scope>
         </dependency>
 
 
diff --git a/modules/samples/sample_pom.xml b/modules/samples/sample_pom.xml
index 6b66f871..6c1a9ce0 100644
--- a/modules/samples/sample_pom.xml
+++ b/modules/samples/sample_pom.xml
@@ -81,19 +81,22 @@
 				<groupId>org.wso2.carbon.devicemgt</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.core</artifactId>
 				<version>${carbon.device.mgt.version}</version>
-                <scope>provided</scope>
+                <scope>system</scope>
+                <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>provided</scope>
+				<scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.common_0.9.2.SNAPSHOT.jar</systemPath>
 			</dependency>
 			<dependency>
 				<groupId>org.wso2.carbon.devicemgt</groupId>
 				<artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
 				<version>${carbon.device.mgt.version}</version>
-                <scope>provided</scope>
+                <scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.analytics_0.9.2.SNAPSHOT.jar</systemPath>
 			</dependency>
 
 			<!--IOT dependencies-->
@@ -102,7 +105,8 @@
 				<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>provided</scope>
+                <scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot.common_1.0.0.SNAPSHOT.jar</systemPath>
 			</dependency>
 
 			<dependency>
@@ -189,7 +193,8 @@
 				<groupId>org.eclipse.paho</groupId>
 				<artifactId>mqtt-client</artifactId>
 				<version>${eclipse.paho.version}</version>
-				<scope>provided</scope>
+				<scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/lib/mqtt-push-1.0-SNAPSHOT-jar-with-dependencies.jar</systemPath>
 			</dependency>
 			<dependency>
 				<groupId>javax</groupId>
@@ -214,7 +219,8 @@
 				<groupId>org.wso2.carbon.analytics</groupId>
 				<artifactId>org.wso2.carbon.analytics.datasource.commons</artifactId>
 				<version>${carbon.analytics.version}</version>
-                <scope>provided</scope>
+				<scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.analytics.datasource.commons_1.0.3.jar</systemPath>
 			</dependency>
 
 
@@ -263,13 +269,15 @@
 				<groupId>com.h2database.wso2</groupId>
 				<artifactId>h2-database-engine</artifactId>
 				<version>${orbit.h2.engine.version}</version>
-				<scope>provided</scope>
+				<scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/h2-database-engine_1.2.140.wso2v3.jar</systemPath>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.tomcat.wso2</groupId>
 				<artifactId>jdbc-pool</artifactId>
 				<version>${orbit.tomcat.jdbc.pooling.version}</version>
-				<scope>provided</scope>
+				<scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/jdbc-pool_7.0.34.wso2v2.jar</systemPath>
 			</dependency>
 
 			<!-- CXF dependencies -->
@@ -303,14 +311,16 @@
 				<groupId>commons-httpclient.wso2</groupId>
 				<artifactId>commons-httpclient</artifactId>
 				<version>${commons-httpclient.orbit.version}</version>
-				<scope>provided</scope>
+				<scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/commons-httpclient_3.1.0.wso2v2.jar</systemPath>
 			</dependency>
 
 			<dependency>
 				<groupId>org.json.wso2</groupId>
 				<artifactId>json</artifactId>
 				<version>${commons-json.version}</version>
-				<scope>provided</scope>
+				<scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar</systemPath>				
 			</dependency>
 
 			<dependency>
@@ -375,12 +385,16 @@
 						<artifactId>org.wso2.carbon.registry.api</artifactId>
 					</exclusion>
 				</exclusions>
+				<scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_4.4.1.jar</systemPath>		
 			</dependency>
 
 			<dependency>
 				<groupId>com.google.code.gson</groupId>
 				<artifactId>gson</artifactId>
 				<version>${google.gson.version}</version>
+				<scope>system</scope>
+				<systemPath>${basedir}/../../../../repository/components/plugins/com.google.gson_2.3.1.jar</systemPath>
 			</dependency>
 
 
@@ -435,7 +449,7 @@
 
 
 		<commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
-		<commons-json.version>3.0.0.wso2v1</commons-json.version>
+		<commons-json.version>2.0.0.wso2v1</commons-json.version>
 		<google.gson.version>2.3.1</google.gson.version>
 
 
diff --git a/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
index c62b182e..9de91f1c 100644
--- a/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
+++ b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
@@ -21,12 +21,10 @@
         <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>
-            <scope>provided</scope>
         </dependency>
 
         <!--CXF -->
@@ -49,7 +47,6 @@
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>mqtt-client</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <!--IOT -->
@@ -61,7 +58,6 @@
         <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>
@@ -91,7 +87,6 @@
         <dependency>
             <groupId>commons-httpclient.wso2</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -115,4 +110,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>