Merge branch 'master' of https://github.com/wso2/product-iots into IoTS-1.0.0

modules/core/pom.xml

@@ -38,6 +38,5 @@
         <module>features</module>
         <module>p2-profile-gen</module>
         <module>distribution</module>
-        <!--<module>integration</module>-->
     </modules>
 </project>

modules/distribution/src/resources/plugins/plugins-deployer.xml

@@ -213,6 +213,6 @@
         </repository>
     </repositories>
     <properties>
-        <carbon.device.mgt.plugin.version>3.0.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.1-SNAPSHOT</carbon.device.mgt.plugin.version>
     </properties>
 </project>

modules/integration/pom.xml

@@ -22,14 +22,14 @@
          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-core-parent</artifactId>
+        <artifactId>wso2iot-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2iot-core-integration</artifactId>
-    <name>>WSO2 IoT - Core - Integration Tests</name>
+    <artifactId>wso2iot-integration</artifactId>
+    <name>>WSO2 IoT - Integration Tests</name>
     <packaging>pom</packaging>
 
     <modules>

modules/integration/tests-artifacts/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-core-integration</artifactId>
+        <artifactId>wso2iot-integration</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -29,6 +29,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tests-artifacts</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 IoT Core - Integration Test Artifacts</name>
+    <name>WSO2 IoT - Integration Test Artifacts</name>
 
 </project>

modules/integration/tests-common/admin-clients/pom.xml

@@ -29,6 +29,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.iot.integration.common.clients</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT Server - Integration Test Common Admin Clients</name>
+    <name>WSO2 IoT - Integration Test Common Admin Clients</name>
 
 </project>

modules/integration/tests-common/pom.xml

@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-core-integration</artifactId>
+        <artifactId>wso2iot-integration</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

modules/integration/tests-common/ui-pages/pom.xml

@@ -31,7 +31,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT - Core - Integration Test Common UI Pages</name>
+    <name>WSO2 IoT - Integration Test Common UI Pages</name>
 
     <dependencies>
         <dependency>

modules/integration/tests-common/web-ui-pages/pom.xml

@@ -31,7 +31,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT Server - Integration Test Common Web UI Pages</name>
+    <name>WSO2 IoT - Integration Test Common Web UI Pages</name>
 
     <dependencies>
         <dependency>

modules/integration/tests-integration-old/pom.xml

@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tests-integration</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT Server Backend Integration Tests</name>
+    <name>WSO2 IoT - Backend Integration Tests</name>
 
     <build>
         <plugins>