Merge branch 'master' into 'master'

Add remote session host and port into iot-server.sh See merge request entgra/product-iots!87
Add remote session host and port into iot-server.sh
2025-09-16 23:32:19 +00:00 · 2021-10-29 04:22:30 +00:00 · 2021-10-15 08:16:43 +05:30 · 2021-03-17 06:28:48 +00:00 · 2021-03-17 11:53:01 +05:30 · 2021-03-03 14:49:59 +00:00
16 changed files with 22 additions and 20 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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-components</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/components/pom.xml
+++ b/modules/components/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>io.entgra.iot</groupId>
        <artifactId>entgra-iot-server-parent</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-server-parent</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@ -22,7 +22,7 @@
 	<parent>
 		<groupId>io.entgra.iot</groupId>
 		<artifactId>entgra-iot-server-parent</artifactId>
-		<version>4.1.0</version>
+		<version>4.1.1-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>

--- a/modules/distribution/src/core/bin/iot-server.sh
+++ b/modules/distribution/src/core/bin/iot-server.sh
@ -340,6 +340,8 @@ do
    -Dagent-bundle="org.wso2.carbon.emm.mdmagent" \
    -Diot.reporting.event.host="" \
    -Diot.reporting.webapp.host="" \
+    -Diot.remotesession.server.host="localhost" \
+    -Diot.remotesession.server.https.port="9443" \
    org.wso2.carbon.bootstrap.Bootstrap $*
    status=$?
 done
--- 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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-features</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>io.entgra.iot</groupId>
        <artifactId>entgra-iot-server-parent</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>io.entgra.iot</groupId>
        <artifactId>entgra-iot-p2-profile</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-p2-profile</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-p2-profile</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-server-parent</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-scripts</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>mobile-qsg</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1-SNAPSHOT</version>
    <name>Entgra 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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-server-parent</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-tools</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>iot-devicetype-archetype</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1-SNAPSHOT</version>
    <name>Entgra IoT - Device Type Archetype</name>
    <description>Entgra 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>io.entgra.iot</groupId>
        <artifactId>entgra-iot-server-parent</artifactId>
-        <version>4.1.0</version>
+        <version>4.1.1-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -23,7 +23,7 @@
    <groupId>io.entgra.iot</groupId>
    <artifactId>entgra-iot-server-parent</artifactId>
    <packaging>pom</packaging>
-    <version>4.1.0</version>
+    <version>4.1.1-SNAPSHOT</version>
    <name>Entgra IoT - Parent</name>
    <url>http://entgra.io</url>
    <description>Entgra IoT Server</description>
@ -1393,7 +1393,7 @@
    <properties>

        <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>4.1.14</carbon.device.mgt.version>
+        <carbon.device.mgt.version>4.1.16-SNAPSHOT</carbon.device.mgt.version>

        <carbon.device.mgt.version.range>[4.0.0, 5.0.0)</carbon.device.mgt.version.range>

@ -1401,7 +1401,7 @@
        <product.iot.version>${project.version}</product.iot.version>

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

        <!--Carbon kernel versions-->
        <carbon.kernel.version>4.4.26</carbon.kernel.version>
@ -1628,7 +1628,7 @@
        <url>https://gitlab.com/entgra/product-iots.git</url>
        <developerConnection>scm:git:https://gitlab.com/entgra/product-iots.git</developerConnection>
        <connection>scm:git:https://gitlab.com/entgra/product-iots.git</connection>
-        <tag>v4.1.0-RC4</tag>
+        <tag>HEAD</tag>
    </scm>

    <build>
Author	SHA1	Message	Date
Pahansith Gunathilake	bad4e9c66f	Merge branch 'master' into 'master' Add remote session host and port into iot-server.sh See merge request entgra/product-iots!87	2021-10-29 04:22:30 +00:00
sandaru	0fefc44da6	Add remote session host and port into iot-server.sh	2021-10-15 08:16:43 +05:30
Dharmakeerthi Lasantha	cb18546152	Merge branch 'master' into 'master' Upgrade dependency versions See merge request entgra/product-iots!84	2021-03-17 06:28:48 +00:00
tcdlpds@gmail.com	3d06168c45	Upgrade dependency versions	2021-03-17 11:53:01 +05:30
Entgra Builder	3dd8a5feac	[maven-release-plugin] prepare for next development iteration	2021-03-03 14:49:59 +00:00
Entgra Builder	da03264fc3	[maven-release-plugin] prepare release v4.1.0-RC5	2021-03-03 14:49:54 +00:00
Dharmakeerthi Lasantha	e8c5c55288	Merge branch 'master' into 'master' Upgrade dependency versions See merge request entgra/product-iots!83	2021-03-03 14:40:04 +00:00
tcdlpds@gmail.com	405a915b2d	Upgrade dependency versions	2021-03-03 20:08:39 +05:30
Entgra Builder	243d8cdf02	[maven-release-plugin] prepare for next development iteration	2021-02-23 23:16:56 +00:00