Merge with upstream master

6 years ago · 389e851b6e
parent 004f78d598 8597453a77
commit 389e851b6e
28 changed files with 43 additions and 32 deletions
--- a/modules/components/org.wso2.iot.core.admin.styles/pom.xml
+++ b/modules/components/org.wso2.iot.core.admin.styles/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-components</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/components/pom.xml
+++ b/modules/components/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/cxf-filters/pom.xml
+++ b/modules/cxf-filters/pom.xml
@ -19,7 +19,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-parent</artifactId>
-		<version>3.5.1-SNAPSHOT</version>
+		<version>3.6.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>

--- a/modules/distribution/src/analytics/conf/carbon.xml
+++ b/modules/distribution/src/analytics/conf/carbon.xml
@ -28,7 +28,7 @@
    <!--
       Product Name
    -->
-    <Name>${product.name}</Name>
+    <Name>Entgra IoT Analytics</Name>

    <!--
       machine readable unique key to identify each product
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@ -18,8 +18,8 @@

 product.name=Entgra IoT Server
 product.key=IoT
-product.version=3.4.0
-product.doc.version=340
+product.version=3.6.0
+product.doc.version=360

 carbon.version=4.4.26
 default.server.role=IoTServer
--- a/modules/distribution/src/broker/conf/carbon.xml
+++ b/modules/distribution/src/broker/conf/carbon.xml
@ -26,17 +26,17 @@
    <!--
       Product Name
    -->
-    <Name>WSO2 Message Broker</Name>
+    <Name>Entgra IoT Message Broker</Name>

    <!--
       machine readable unique key to identify each product
    -->
-    <ServerKey>MB</ServerKey>
+    <ServerKey>${product.key}</ServerKey>

    <!--
       Product Version
    -->
-    <Version>3.4.0</Version>
+    <Version>${product.version}</Version>

    <!--
       Host name or IP address of the machine hosting this server
--- a/modules/features/org.wso2.iot.core.styles.feature/pom.xml
+++ b/modules/features/org.wso2.iot.core.styles.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-features</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/integration-common/pom.xml
+++ b/modules/integration/tests-common/integration-common/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>tests-common</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java
+++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java
@ -57,7 +57,7 @@ public class CarbonServerManagerExtension {
    private int portOffset = 0;
    private static final String SERVER_SHUTDOWN_MESSAGE = "Halting JVM";
    private static final String SERVER_STARTUP_MESSAGE = "Mgt Console URL";
-    private static final long DEFAULT_START_STOP_WAIT_MS = 400000L;
+    private static final long DEFAULT_START_STOP_WAIT_MS = 900000L;
    private static final String CMD_ARG = "cmdArg";
    private static int defaultHttpPort = Integer.parseInt("9763");
    private static int defaultHttpsPort = Integer.parseInt("9443");
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-common/web-ui-pages/pom.xml
+++ b/modules/integration/tests-common/web-ui-pages/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>tests-common</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-integration</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mssql.sql
+++ b/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mssql.sql
@ -0,0 +1,3 @@
+ALTER TABLE DM_ENROLMENT ALTER COLUMN OWNER VARCHAR (255) NOT NULL;
+
+ALTER TABLE DM_GROUP ALTER COLUMN OWNER VARCHAR (255) DEFAULT NULL;
--- a/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mysql.sql
+++ b/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mysql.sql
@ -0,0 +1,5 @@
+ALTER TABLE `DM_ENROLMENT`
+CHANGE COLUMN `OWNER` `OWNER` VARCHAR(255) NOT NULL;
+
+ALTER TABLE `DM_GROUP`
+CHANGE COLUMN `OWNER` `OWNER` VARCHAR(255) NULL DEFAULT NULL;
--- a/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-postgres.sql
+++ b/modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-postgres.sql
@ -0,0 +1,3 @@
+ALTER TABLE dm_enrolment ALTER COLUMN owner TYPE character varying(255);
+
+ALTER TABLE dm_group ALTER COLUMN owner TYPE character varying(255);
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/p2-profile/broker-profile/pom.xml
+++ b/modules/p2-profile/broker-profile/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/p2-profile/pom.xml
+++ b/modules/p2-profile/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/scripts/mobile-qsg/pom.xml
+++ b/modules/scripts/mobile-qsg/pom.xml
@ -21,13 +21,13 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-scripts</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>mobile-qsg</artifactId>
-    <version>3.5.1-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
    <name>WSO2 IoT - QSG Script</name>
    <description>This includes the tools for IoTs Quick Start Guide</description>
    <packaging>jar</packaging>
--- a/modules/scripts/pom.xml
+++ b/modules/scripts/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/pom.xml
@ -20,13 +20,13 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-tools</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>iot-devicetype-archetype</artifactId>
-    <version>3.5.1-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
    <name>WSO2 IoT - Device Type Archetype</name>
    <description>WSO2 IoT Device Type Archetype</description>
    <packaging>maven-archetype</packaging>
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.5.1-SNAPSHOT</version>
+        <version>3.6.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -23,7 +23,7 @@
    <groupId>org.wso2.iot</groupId>
    <artifactId>wso2iot-parent</artifactId>
    <packaging>pom</packaging>
-    <version>3.5.1-SNAPSHOT</version>
+    <version>3.6.0-SNAPSHOT</version>
    <name>WSO2 IoT - Parent</name>
    <url>http://wso2.org</url>
    <description>WSO2 IoT Server</description>
@ -1528,14 +1528,14 @@
        <carbon.governance.version>4.7.23</carbon.governance.version>

        <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.2.5-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.2.7-SNAPSHOT</carbon.device.mgt.version>
        <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>

        <!-- IOT Device Management -->
        <product.iot.version>${project.version}</product.iot.version>

        <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>4.2.5-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.2.7-SNAPSHOT</carbon.device.mgt.plugin.version>

        <!-- API Management -->
        <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>