Merge branch 'master' of https://github.com/charithag/product-iot-server

# Conflicts: # modules/samples/doormanager/component/pom.xml
9 years ago · 16a8e63497
parent a2c016efcc
commit 16a8e63497
2 changed files with 8 additions and 8 deletions
--- a/modules/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/pom.xml
@ -20,7 +20,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-parent</artifactId>
+        <artifactId>wso2cdmf-tools</artifactId>
        <version>1.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>