pahansith
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into add-emm-analytics

Browse Source 
# Conflicts:
#	modules/p2-profile/iot-core-profile/pom.xml
application-manager-new
charitha 7 years ago
parent 0a1d8c91e6 46ff37100d
commit 56c883d889
3 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
modules/integration/tests-integration/src/test/resources/instrumentation.txt
Unescape View File

@ -1,5 +1,4 @@
org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization_ org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization_
org.wso2.carbon.device.mgt.analytics.dashboard_
org.wso2.carbon.device.mgt.analytics.data.publisher_ org.wso2.carbon.device.mgt.analytics.data.publisher_
org.wso2.carbon.device.mgt.common_ org.wso2.carbon.device.mgt.common_
org.wso2.carbon.device.mgt.core_ org.wso2.carbon.device.mgt.core_
@ -34,7 +33,6 @@ org.wso2.carbon.email.sender.core_
org.wso2.carbon.identity.jwt.client.extension_ org.wso2.carbon.identity.jwt.client.extension_
org.wso2.carbon.identity.authenticator.backend.oauth_ org.wso2.carbon.identity.authenticator.backend.oauth_
org.wso2.carbon.webapp.authenticator.framework_ org.wso2.carbon.webapp.authenticator.framework_
org.wso2.carbon.device.mgt.analytics.dashboard_
org.wso2.carbon.complex.policy.decision.point_ org.wso2.carbon.complex.policy.decision.point_
org.wso2.carbon.appmgt.mdm.osgiconnector_ org.wso2.carbon.appmgt.mdm.osgiconnector_
org.wso2.carbon.appmgt.mdm.restconnector_ org.wso2.carbon.appmgt.mdm.restconnector_

40
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -193,9 +193,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- IoT Device Management Features --> <!-- IoT Device Management Features -->
<!-- Carbon Deployment Features --> <!-- Carbon Deployment Features -->
@ -746,10 +743,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version} org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}
</featureArtifactDef> </featureArtifactDef>
<!-- Analytics related features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- Geo Dashboard feature --> <!-- Geo Dashboard feature -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
@ -1011,10 +1004,6 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -1621,11 +1610,6 @@
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>
</feature> </feature>
<!-- Analytics related features -->
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id> <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -2051,10 +2035,6 @@
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id> <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.adapter.feature.group</id> <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@ -2112,6 +2092,10 @@
<id>org.wso2.carbon.core.runtime.feature.group</id> <id>org.wso2.carbon.core.runtime.feature.group</id>
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.core.feature.group</id>
<version>${carbon.kernel.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.core.ui.feature.group</id> <id>org.wso2.carbon.core.ui.feature.group</id>
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
@ -2477,10 +2461,6 @@
<id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id> <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.event.stream.feature.group</id> <id>org.wso2.carbon.event.stream.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
@ -2695,10 +2675,6 @@
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id> <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<feature> <feature>
@ -2741,6 +2717,10 @@
<id>org.wso2.carbon.core.runtime.feature.group</id> <id>org.wso2.carbon.core.runtime.feature.group</id>
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.core.feature.group</id>
<version>${carbon.kernel.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.core.ui.feature.group</id> <id>org.wso2.carbon.core.ui.feature.group</id>
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
@ -3096,10 +3076,6 @@
<id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id> <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.event.stream.feature.group</id> <id>org.wso2.carbon.event.stream.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>

4
pom.xml
Unescape View File

@ -1517,14 +1517,14 @@
<carbon.governance.version>4.7.8</carbon.governance.version> <carbon.governance.version>4.7.8</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>3.0.135</carbon.device.mgt.version> <carbon.device.mgt.version>3.0.144</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.0.87</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.0.88</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.1.109</carbon.api.mgt.version> <carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>

Write Preview
Loading…
Cancel
Save