diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml
index 062763ddb..dca3cdf25 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml
@@ -57,22 +57,22 @@
${project.artifactId}
${project.artifactId}
-
- org.wso2.carbon.device.mgt.input.adapter.extension.internal,
- org.wso2.carbon.device.mgt.input.adapter.extension.internal.*
-
+
+ org.wso2.carbon.device.mgt.input.adapter.extension.internal,
+ org.wso2.carbon.device.mgt.input.adapter.extension.internal.*
+
org.wso2.carbon.device.mgt.input.adapter.extension.*,
- !org.wso2.carbon.device.mgt.input.adapter.extension.internal,
+ !org.wso2.carbon.device.mgt.input.adapter.extension.internal,
-
- org.osgi.framework,
- org.osgi.service.component,
- com.jayway.jsonpath,
- org.apache.commons.logging,
- org.json.simple,
- org.json.simple.parser
-
+
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
+ com.jayway.jsonpath,
+ org.apache.commons.logging,
+ org.json.simple,
+ org.json.simple.parser
+
diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml
index c47a517fd..88f4c66ff 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml
@@ -140,8 +140,8 @@
com.nimbusds.jose,
com.nimbusds.jose.crypto,
com.nimbusds.jwt,
- org.osgi.framework,
- org.osgi.service.component,
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
javax.servlet,
javax.servlet.http,
org.osgi.service.http,
diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
index f08ddcbd9..0616bdd87 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
@@ -142,9 +142,8 @@
org.apache.commons.codec.binary,
org.apache.commons.logging,
org.apache.http.entity,
- org.osgi.framework,
- org.osgi.service.component,
- org.osgi.service.http,
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.wso2.carbon.core,
org.wso2.carbon.device.mgt.input.adapter.extension,
diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml
index a5805bd16..a6c278a6c 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml
@@ -111,8 +111,8 @@
!javax.xml.namespace,
javax.xml.namespace; version=0.0.0,
org.apache.commons.logging,
- org.osgi.framework,
- org.osgi.service.component,
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.wso2.carbon.databridge.commons,
org.wso2.carbon.databridge.core,
diff --git a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml
index 7e0ff15a8..a58b5cec2 100644
--- a/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml
@@ -117,14 +117,13 @@
org.apache.log4j,
org.wso2.carbon.base,
org.wso2.carbon.core.util,
- org.apache.commons.logging,
- org.osgi.framework,
- org.osgi.service.component,
- org.osgi.service.http,
- org.wso2.carbon.context,
- org.wso2.carbon.core,
- org.wso2.carbon.device.mgt.input.adapter.extension,
- org.wso2.carbon.user.core.service
+ org.apache.commons.logging,
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
+ org.wso2.carbon.context,
+ org.wso2.carbon.core,
+ org.wso2.carbon.device.mgt.input.adapter.extension,
+ org.wso2.carbon.user.core.service
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml
index 6c7e8dfd1..f196c4b30 100644
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml
@@ -118,8 +118,8 @@
org.eclipse.paho.client.mqttv3.persist,
org.json.simple,
org.json.simple.parser,
- org.osgi.framework,
- org.osgi.service.component,
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.apache.commons.codec.binary,
org.apache.http.client.entity,
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml
index 2ad3c6ba5..c5b6f95a0 100644
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml
@@ -127,8 +127,8 @@
org.eclipse.paho.client.mqttv3.persist,
org.json.simple,
org.json.simple.parser,
- org.osgi.framework,
- org.osgi.service.component,
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.apache.commons.codec.binary,
org.apache.http.client.entity,
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml
index 5c6064735..9d46d7de9 100644
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml
@@ -154,8 +154,8 @@
com.google.gson,
javax.websocket,
org.apache.commons.logging,
- org.osgi.framework,
- org.osgi.service.component,
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context,
org.wso2.carbon.databridge.commons,
org.wso2.carbon.event.stream.core,
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml
index 0a12b176a..3a2a90f52 100644
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml
@@ -96,8 +96,8 @@
org.wso2.carbon.event.output.adapter.core.*,
org.jivesoftware.smack.*,
org.apache.commons.logging,
- org.osgi.framework,
- org.osgi.service.component,
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context
diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml
index e32623074..74baeec15 100644
--- a/components/extensions/pom.xml
+++ b/components/extensions/pom.xml
@@ -34,7 +34,7 @@
cdmf-transport-adapters
- mb-extensions
+
pull-notification-listeners
diff --git a/components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml
index 9e094a66b..36bb6b50b 100644
--- a/components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml
+++ b/components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml
@@ -86,8 +86,8 @@
org.wso2.carbon.device.mgt.mqtt.notification.listener.*
- org.osgi.framework,
- org.osgi.service.component,
+ org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+ org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.apache.commons.logging,
org.wso2.carbon.device.mgt.common.*,
org.wso2.carbon.device.mgt.core.service,
diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml
index 616bf07fc..7d3e80442 100644
--- a/features/extensions-feature/pom.xml
+++ b/features/extensions-feature/pom.xml
@@ -35,8 +35,8 @@
org.wso2.carbon.device.mgt.adapter.feature
- org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature
- org.wso2.carbon.andes.extensions.device.mgt.api.feature
+
+
org.wso2.carbon.device.mgt.notification.listener.feature
diff --git a/pom.xml b/pom.xml
index 6ded7706f..8e87e5d72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,13 +36,13 @@
components/extensions
- components/mobile-plugins
-
- components/analytics
- components/test-coverage
- features/analytics-feature
- features/mobile-plugins-feature
-
+
+
+
+
+
+
+
features/extensions-feature
@@ -102,7 +102,7 @@
org.wso2.carbon
org.wso2.carbon.logging
- ${carbon.kernel.version}
+ ${carbon.logging.version}
org.apache.log4j.wso2
@@ -300,22 +300,6 @@
org.wso2.carbon.certificate.mgt.core
${carbon.devicemgt.version}
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.device.mgt.analytics.data.publisher
- ${carbon.devicemgt.version}
-
-
- jboss
- javassist
-
-
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.dynamic.client.registration
- ${carbon.devicemgt.version}
-
org.wso2.carbon.devicemgt
org.wso2.carbon.identity.jwt.client.extension
@@ -331,16 +315,6 @@
org.wso2.carbon.apimgt.webapp.publisher
${carbon.devicemgt.version}
-
- org.wso2.carbon.event-processing
- org.wso2.carbon.siddhi.geo.event.fuser
- ${carbon.event.processing.version}
-
-
- org.wso2.carbon.event-processing
- org.wso2.carbon.siddhi.geo.event.notifier
- ${carbon.event.processing.version}
-
org.wso2.carbon.devicemgt
org.wso2.carbon.apimgt.annotations
@@ -403,11 +377,6 @@
org.wso2.carbon.databridge.core
${carbon.analytics.common.version}
-
- org.wso2.carbon.analytics
- org.wso2.carbon.analytics.api
- ${carbon.analytics.version}
-
org.wso2.carbon.analytics-common
org.wso2.carbon.event.stream.core
@@ -1155,7 +1124,7 @@
4.1.16-SNAPSHOT
- [4.0.0, 5.0.0)
+ [4.1.15, 5.0.0)
5.0.16-SNAPSHOT
@@ -1168,10 +1137,11 @@
1.8
- 4.4.26
- [4.4.0, 4.5.0)
+ 4.6.2
+ [4.5.0, 5.0.0)
+ 4.4.9
- 1.5.4
+ 5.1.2
[1.6.1.wso2v11, 1.7.0)
@@ -1188,7 +1158,7 @@
3.6.100.v20120522-1841
- 3.9.1.v20130814-1242
+ 3.9.1.v20140110-1610
1.2.140.wso2v3
@@ -1196,7 +1166,7 @@
7.0.34.wso2v2
- 2.6.1
+ 3.3.6
2.5.11
1.9.0
1.1.1
@@ -1208,22 +1178,22 @@
4.7.15
- 5.11.148
- 5.6.63
- [5.2.0, 6.0.0)
- 5.1.2
+ 5.18.187
+ 6.4.111
+ [5.2.0, 7.0.0)
+ 5.1.5
- 4.6.11
+ 4.9.10
- 4.6.28
+ 4.7.39
- 4.7.23
+ 4.8.21
- 6.2.201
+ 9.0.174
3.0.4.wso2v1
@@ -1234,21 +1204,18 @@
8.1.3.v20120416
- 1.5.8
+ 1.5.10
- 5.1.37
- [5.1.3,6.0.0)
- 1.3.25
- [1.3.0,2.0.0)
- 2.1.23
+ 5.2.34
+ [5.2.0,6.0.0)
1.51.0.0
1.49
2.0.0
3.0.21
- 2.3.1
+ 2.8.5
1.0.2
2.4.0.wso2v1
2.4
@@ -1265,8 +1232,8 @@
1.2.11.wso2v10
1.2.17
- 3.0.5.RELEASE
- 2.1.0.RELEASE
+ 5.1.13.RELEASE
+ 3.0.8.RELEASE
2.2.8
1.3.18
1.52.0.wso2v2
@@ -1313,7 +1280,7 @@
3.2.34
3.2.50
- 2.6.1.wso2v1
+ 2.9.8.wso2v1
3.2.34
@@ -1335,6 +1302,11 @@
3.8.1
1.13.0
9.3.1
+
+ 2.7.18
+
+ [1.6.0, 2.0.0)
+ [1.2.0,1.3.0)