diff --git a/components/iot-plugins/pom.xml b/components/iot-plugins/pom.xml
index 63c049947f..d1ef746137 100644
--- a/components/iot-plugins/pom.xml
+++ b/components/iot-plugins/pom.xml
@@ -36,7 +36,7 @@
androidsense-plugin
arduino-plugin
raspberrypi-plugin
- virtual-fire-alarm-plugin
+
iot-base-plugin
iot-analytics
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
index 46e9fad751..4079df3883 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
@@ -176,6 +176,12 @@
org.wso2.carbon.devicemgt
org.wso2.carbon.device.mgt.analytics.data.publisher
provided
+
+
+ org.slf4j
+ slf4j-api
+
+
org.wso2.carbon.analytics
@@ -199,6 +205,12 @@
io.swagger
swagger-jaxrs
+
+
+ org.slf4j
+ slf4j-api
+
+
javax.servlet
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
index 082ea08094..3f545acaa6 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
@@ -58,7 +58,7 @@
javax.xml.bind.*,
javax.naming,
javax.sql,
- javax.xml.parsers,
+ javax.xml.parsers; version=0.0.0,
org.w3c.dom,
org.wso2.carbon.context,
org.wso2.carbon.utils.*,
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
index b8c5c2911f..ffd0170867 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
@@ -173,16 +173,18 @@
- org.apache.ws.commons.axiom
- axiom-api
+ org.apache.ws.commons.axiom.wso2
+ axiom
+ provided
-
+
log4j
log4j
+ provided
org.springframework
@@ -206,12 +208,14 @@
saaj-impl
- org.bouncycastle
+ org.wso2.orbit.org.bouncycastle
bcpkix-jdk15on
+ provided
- org.bouncycastle
+ org.wso2.orbit.org.bouncycastle
bcprov-jdk15on
+ provided
org.codehaus.plexus
@@ -232,6 +236,7 @@
commons-codec
commons-codec
+ provided
joda-time
@@ -240,6 +245,7 @@
commons-io
commons-io
+ provided
javax.ws.rs
@@ -248,10 +254,12 @@
org.testng
testng
+ test
org.wso2.carbon
org.wso2.carbon.logging
+ provided
@@ -269,6 +277,10 @@
org.wso2.carbon.identity
org.wso2.carbon.identity.base
+
+ org.slf4j
+ slf4j-api
+
@@ -307,10 +319,12 @@
org.wso2.tomcat
tomcat-servlet-api
+ provided
com.google.code.gson
gson
+ provided
org.wso2.carbon.devicemgt
@@ -331,11 +345,13 @@
org.codehaus.jettison.wso2
jettison
1.1.wso2v1
+ provided
org.json.wso2
json
2.0.0.wso2v1
+ provided
io.swagger
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 fc09a5d288..864c5fffdd 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
@@ -172,7 +172,7 @@
org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
- org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
+ org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${identity.inbound.auth.oauth.version}
diff --git a/pom.xml b/pom.xml
index 279f11a465..80af5aba47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,10 +623,6 @@
org.wso2.carbon
org.wso2.carbon.identity.oauth
-
- org.wso2.carbon
- org.wso2.carbon.apimgt.keymgt.client
-
org.apache.poi
poi-ooxml
@@ -912,15 +908,15 @@
${wss4j.security.common.version}
- org.apache.ws.commons.axiom
- axiom-api
+ org.apache.ws.commons.axiom.wso2
+ axiom
${axiom-api.version}
-
+
log4j
log4j
@@ -952,14 +948,14 @@
${saaj-impl.version}
- org.bouncycastle
+ org.wso2.orbit.org.bouncycastle
bcpkix-jdk15on
${bcpkix-jdk15on.version}
- org.bouncycastle
+ org.wso2.orbit.org.bouncycastle
bcprov-jdk15on
- ${bcpkix-jdk15on.version}
+ ${bcprov-jdk15on.version}
org.codehaus.plexus
@@ -1000,13 +996,13 @@
org.wso2.carbon.identity
org.wso2.carbon.identity.oauth.stub
- ${carbon.identity.version}
+ ${identity.inbound.auth.oauth.version}
provided
org.wso2.carbon.identity
org.wso2.carbon.identity.oauth
- ${carbon.identity.version}
+ ${identity.inbound.auth.oauth.version}
provided
@@ -1092,7 +1088,7 @@
1.7
- 4.4.3
+ 4.4.9
[4.4.0, 4.5.0)
1.5.4
@@ -1135,23 +1131,25 @@
4.4.8
- 4.6.0
+ 4.7.0
- 5.0.7
+ 5.2.0
+ 5.1.2
+ 5.1.1
[5.0.7, 6.0.0)
- 4.5.0
+ 4.6.0
- 4.4.8
+ 4.5.6
- 4.5.8
+ 4.6.4
- 5.0.5
+ 6.0.5
3.0.4.wso2v1
@@ -1184,13 +1182,14 @@
6.0
- 1.2.14
+ 1.2.11.wso2v10
1.2.17
3.0.5.RELEASE
2.1.0.RELEASE
2.2.8
1.3.18
- 1.49
+ 1.52.0.wso2v2
+ 1.52.0.wso2v1
3.0.21
2.2
1.6.17