Merge branch 'master' into 'master'

including heart-beat feature in product

See merge request entgra/product-iots!74
808-multi-tenant-signin-not-working
Dharmakeerthi Lasantha 4 years ago
commit ee2cad5759

@ -100,6 +100,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.server.heart.beat.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version} org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version}
</featureArtifactDef> </featureArtifactDef>
@ -448,6 +451,10 @@
<id>org.wso2.carbon.device.mgt.basics.feature.group</id> <id>org.wso2.carbon.device.mgt.basics.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>io.entgra.server.heart.beat.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.email.sender.feature.group</id> <id>org.wso2.carbon.email.sender.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>

@ -173,7 +173,7 @@
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:io.entgra.server.heart.beat.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
@ -939,6 +939,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>io.entgra.server.heart.beat.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -1939,6 +1943,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>io.entgra.server.heart.beat.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>
@ -2351,6 +2359,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>io.entgra.server.heart.beat.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>
@ -2543,6 +2555,10 @@
<id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>io.entgra.server.heart.beat.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>

Loading…
Cancel
Save