diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
index b83112da0..325f16281 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
@@ -164,7 +164,6 @@
                             org.apache.log4j;version="[1.2,2)",
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
-                            org.osgi.service.http;version="[1.2,2)",
                             org.wso2.carbon.base;version="[1.0,2)",
                             org.wso2.carbon.context;version="[4.8,5)",
                             org.wso2.carbon.core.util;version="[4.8,5)",
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
index 5c83e50b7..f935c0c7b 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
@@ -149,7 +149,6 @@
                             org.eclipse.paho.client.mqttv3.persist;version="[1.0,2)",
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
-                            org.osgi.service.http;version="[1.2,2)",
                             org.wso2.carbon.context;version="[4.8,5)",
                             org.wso2.carbon.core;version="[4.8,5)",
                             org.wso2.carbon.core.multitenancy.utils;version="[4.8,5)",
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
index 55a32c0c8..64f5d7fb4 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
@@ -119,7 +119,6 @@
                             org.jivesoftware.smack.packet,
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
-                            org.osgi.service.http;version="[1.2,2)",
                             org.wso2.carbon.context;version="[4.8,5)",
                             org.wso2.carbon.core;version="[4.8,5)",
                             org.wso2.carbon.event.input.adapter.core;version="[5.3,6)",
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
index b2e869d18..477b4bf73 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
@@ -173,18 +173,18 @@
                                 <bundleDef>
                                     io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.extension:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
-<!--                                <bundleDef>-->
-<!--                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.mqtt:${io.entgra.device.mgt.plugins.version}-->
-<!--                                </bundleDef>-->
-								<bundleDef>
-									io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.thrift:${io.entgra.device.mgt.plugins.version}
-								</bundleDef>
-								<bundleDef>
-									org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.wso2event:${carbon.analytics.common.version}
-								</bundleDef>
-<!--                                <bundleDef>-->
-<!--                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.xmpp:${io.entgra.device.mgt.plugins.version}-->
-<!--                                </bundleDef>-->
+                                <bundleDef>
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.mqtt:${io.entgra.device.mgt.plugins.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.thrift:${io.entgra.device.mgt.plugins.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.wso2event:${carbon.analytics.common.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.xmpp:${io.entgra.device.mgt.plugins.version}
+                                </bundleDef>
                                 <bundleDef>
                                     io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.websocket:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
@@ -204,15 +204,15 @@
                                 <bundleDef>
                                     com.jayway.jsonpath:json-path
                                 </bundleDef>
-								<bundleDef>
-									io.github.openfeign:feign-core:${io.github.openfeign.version}
-								</bundleDef>
-								<bundleDef>
-									io.github.openfeign:feign-slf4j:${io.github.openfeign.version}
-								</bundleDef>
-								<bundleDef>
-									io.github.openfeign:feign-gson:${io.github.openfeign.version}
-								</bundleDef>
+                                <bundleDef>
+                                    io.github.openfeign:feign-core:${io.github.openfeign.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    io.github.openfeign:feign-slf4j:${io.github.openfeign.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    io.github.openfeign:feign-gson:${io.github.openfeign.version}
+                                </bundleDef>
                             </bundles>
                         </configuration>
                     </execution>