Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud

modules/p2-profile-gen/pom.xml

@@ -110,7 +110,7 @@
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.devicemgt.user.server.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.user.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
 				                <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
@@ -337,7 +337,7 @@
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.devicemgt.user.server.feature.group</id>
+                                    <id>org.wso2.carbon.device.mgt.user.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
 				                <feature>

pom.xml

@@ -355,9 +355,9 @@
 
             <!--MDM dependencies-->
             <dependency>
-                <groupId>org.wso2.carbon.mdm</groupId>
+                <groupId>org.wso2.carbon.iot</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.impl</artifactId>
-                <version>${carbon.mobile.device.mgt.version}</version>
+                <version>${carbon.iot.device.mgt.version}</version>
             </dependency>
 
             <!--Osgi dependencies-->
@@ -785,7 +785,7 @@
         <carbon.device.mgt.version.range>[0.8.0, 2.0.0)</carbon.device.mgt.version.range>
 
         <!-- Mobile Device Management -->
-        <carbon.mobile.device.mgt.version>1.9.2-SNAPSHOT</carbon.mobile.device.mgt.version>
+        <carbon.iot.device.mgt.version>1.9.2-SNAPSHOT</carbon.iot.device.mgt.version>
         <mdm.version>1.0.0-SNAPSHOT</mdm.version>
 
         <!-- API Management -->