Merge pull request 'master' (#2) from community/community-product:master into master

Reviewed-on: #2

iot-core/pom.xml

@@ -300,6 +300,17 @@
                                     org.wso2.carbon.devicemgt:io.entgra.application.mgt.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <!-- End of New App Manager Features-->
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.defaultrole.manager.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.logger.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.stateengine.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -429,6 +440,21 @@
                                     <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
+                                <feature>
+                                    <id>io.entgra.device.mgt.extensions.defaultrole.manager.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>io.entgra.device.mgt.extensions.logger.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>io.entgra.device.mgt.extensions.stateengine.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>

pom.xml

@@ -114,14 +114,14 @@
         <entgra-emm-community>entgra-emm-community-${project.version}</entgra-emm-community>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>5.0.13</carbon.device.mgt.version>
+        <carbon.device.mgt.version>5.0.14-SNAPSHOT</carbon.device.mgt.version>
 
         <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
 
         <!--Orbit versions-->
         <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
 
-        <carbon.device.mgt.plugin.version>6.0.6</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>6.0.7-SNAPSHOT</carbon.device.mgt.plugin.version>
 
 
     </properties>