diff --git a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
index 170176ad7d..9d5353c6cb 100644
--- a/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
+++ b/components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.input.adapter.extension/pom.xml
@@ -53,5 +53,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
\ No newline at end of file
diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
index 79a61d850f..e794f26778 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
@@ -160,6 +160,18 @@
 								<bundleDef>
 									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.output.adapter.ui:${carbon.devicemgt.plugins.version}
 								</bundleDef>
+                                <bundleDef>
+									org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
+								</bundleDef>
+                                <bundleDef>
+                                    org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
+                                </bundleDef>
 							</bundles>
 							<importFeatures>
 								<importFeatureDef>
diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
index d29cfb369f..950d6d84df 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
@@ -137,15 +137,6 @@
 								<bundleDef>
 									org.json.wso2:json:${commons-json.version}
 								</bundleDef>
-								<bundleDef>
-									org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
-								</bundleDef>
-								<bundleDef>
-									org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
-								</bundleDef>
-								<bundleDef>
-									org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
-								</bundleDef>
 							</bundles>
 							<importFeatures>
 								<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}