community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'newAPPM' into 'application-manager-new'

Browse Source 
Merge with upstream master

See merge request entgra/product-iots!16
merge-requests/25/head
Dharmakeerthi Lasantha 6 years ago
parent 004f78d598 389e851b6e
commit 60f3fc6d37
28 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File

2
modules/components/org.wso2.iot.core.admin.styles/pom.xml
Unescape View File

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

2
modules/components/pom.xml
Unescape View File

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

2
modules/cxf-filters/pom.xml
Unescape View File

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

2
modules/distribution/pom.xml
Unescape View File

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

2
modules/distribution/src/analytics/conf/carbon.xml
Unescape View File

@ -28,7 +28,7 @@
<!-- <!--
Product Name Product Name
--> -->
<Name>${product.name}</Name> <Name>Entgra IoT Analytics</Name>
<!-- <!--
machine readable unique key to identify each product machine readable unique key to identify each product

4
modules/distribution/src/assembly/filter.properties
Unescape View File

@ -18,8 +18,8 @@
product.name=Entgra IoT Server product.name=Entgra IoT Server
product.key=IoT product.key=IoT
product.version=3.4.0 product.version=3.6.0
product.doc.version=340 product.doc.version=360
carbon.version=4.4.26 carbon.version=4.4.26
default.server.role=IoTServer default.server.role=IoTServer

6
modules/distribution/src/broker/conf/carbon.xml
Unescape View File

@ -26,17 +26,17 @@
<!-- <!--
Product Name Product Name
--> -->
<Name>WSO2 Message Broker</Name> <Name>Entgra IoT Message Broker</Name>
<!-- <!--
machine readable unique key to identify each product machine readable unique key to identify each product
--> -->
<ServerKey>MB</ServerKey> <ServerKey>${product.key}</ServerKey>
<!-- <!--
Product Version Product Version
--> -->
<Version>3.4.0</Version> <Version>${product.version}</Version>
<!-- <!--
Host name or IP address of the machine hosting this server Host name or IP address of the machine hosting this server

2
modules/features/org.wso2.iot.core.styles.feature/pom.xml
Unescape View File

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

2
modules/features/pom.xml
Unescape View File

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

2
modules/integration/pom.xml
Unescape View File

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

2
modules/integration/tests-common/integration-common/pom.xml
Unescape View File

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

2
modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java
Unescape View File

@ -57,7 +57,7 @@ public class CarbonServerManagerExtension {
private int portOffset = 0; private int portOffset = 0;
private static final String SERVER_SHUTDOWN_MESSAGE = "Halting JVM"; private static final String SERVER_SHUTDOWN_MESSAGE = "Halting JVM";
private static final String SERVER_STARTUP_MESSAGE = "Mgt Console URL"; 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 final String CMD_ARG = "cmdArg";
private static int defaultHttpPort = Integer.parseInt("9763"); private static int defaultHttpPort = Integer.parseInt("9763");
private static int defaultHttpsPort = Integer.parseInt("9443"); private static int defaultHttpsPort = Integer.parseInt("9443");

2
modules/integration/tests-common/pom.xml
Unescape View File

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

2
modules/integration/tests-common/web-ui-pages/pom.xml
Unescape View File

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

2
modules/integration/tests-integration/pom.xml
Unescape View File

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

2
modules/integration/tests-iot-web-ui/pom.xml
Unescape View File

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

3
modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mssql.sql
Unescape View File

@ -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;

5
modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-mysql.sql
Unescape View File

@ -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;

3
modules/migration/migration-iot_3.3.1-to-iot_3.6.0/cdm-migration-postgres.sql
Unescape View File

@ -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);

2
modules/p2-profile/analytics-profile/pom.xml
Unescape View File

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

2
modules/p2-profile/broker-profile/pom.xml
Unescape View File

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

2
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

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

2
modules/p2-profile/pom.xml
Unescape View File

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

4
modules/scripts/mobile-qsg/pom.xml
Unescape View File

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

2
modules/scripts/pom.xml
Unescape View File

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

4
modules/tools/cdmf-devicetype-archetype/pom.xml
Unescape View File

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

2
modules/tools/pom.xml
Unescape View File

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

6
pom.xml
Unescape View File

@ -23,7 +23,7 @@
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId> <artifactId>wso2iot-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>3.5.1-SNAPSHOT</version> <version>3.6.0-SNAPSHOT</version>
<name>WSO2 IoT - Parent</name> <name>WSO2 IoT - Parent</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>WSO2 IoT Server</description> <description>WSO2 IoT Server</description>
@ -1528,14 +1528,14 @@
<carbon.governance.version>4.7.23</carbon.governance.version> <carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management--> <!-- 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> <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- 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 --> <!-- API Management -->
<carbon.api.mgt.version>6.2.201</carbon.api.mgt.version> <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>

Write Preview
Loading…
Cancel
Save