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

Sync with upstream master See merge request entgra/product-iots!25
5 years ago · e5d7761cef
parent e60208ffbb e69499e247
commit e5d7761cef
28 changed files with 39 additions and 39 deletions
--- a/README.md
+++ b/README.md
@ -10,8 +10,8 @@ It also offers a complete and secure enterprise mobility management (EMM/MDM) so
 Entgra IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state.
-Find the online documentation at : 
+Find the online documentation at :  
-https://entgra.atlassian.net/wiki/spaces/IoTS340/overview.
+https://entgra-documentation.gitlab.io/v3.7.0
 ### Key Features of Entgra IoT Server
@ -53,11 +53,11 @@ https://entgra.atlassian.net/wiki/spaces/IoTS340/overview.
 * Support for SCEP protocol (encryption and authenticity)
 ### How to Run
-* Extract the downloaded entgraiot-3.6.0.zip file; this will create a folder named ‘entgraiot-3.6.0’.
+* Extract the downloaded entgraiot-3.7.0.zip file; this will create a folder named ‘entgraiot-3.7.0’.
 * IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts:
-    * entgraiot-3.6.0/bin/broker.sh [.bat]
+    * entgraiot-3.7.0/bin/broker.sh [.bat]
-    * entgraiot-3.6.0/bin/iot-server.sh [.bat]
+    * entgraiot-3.7.0/bin/iot-server.sh [.bat]
-    * entgraiot-3.6.0/bin/analytics.sh [.bat]
+    * entgraiot-3.7.0/bin/analytics.sh [.bat]
 ### How to Contribute
--- 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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+		<version>3.7.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
--- a/modules/distribution/src/analytics/samples/device-plugins/pom.xml
+++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
@ -27,7 +27,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.wso2.iot.analytics.devicemgt-plugins</groupId>
    <artifactId>analytics-devicetype-feature-installation</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - Analytics</name>
    <url>http://wso2.org</url>
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@ -18,7 +18,7 @@
 product.name=Entgra IoT Server
 product.key=IoT
-product.version=3.6.0
+product.version=3.7.0-SNAPSHOT
 product.doc.version=360
 carbon.version=4.4.26
--- a/modules/distribution/src/core/bin/carbondump.bat
+++ b/modules/distribution/src/core/bin/carbondump.bat
@ -193,6 +193,6 @@ goto end
 :invalidUsage
 echo Usage: carbondump.bat [-carbonHome path] [-pid of the carbon instance]
-echo   e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.6.0\ -pid 5151
+echo   e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.7.0\ -pid 5151
 :END
--- a/modules/distribution/src/core/release-notes.html
+++ b/modules/distribution/src/core/release-notes.html
@ -8,14 +8,14 @@
 <a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
-<h1>Release Note - Entgra IoT Server Version 3.6.0</h1>
+<h1>Release Note - Entgra IoT Server Version 3.7.0</h1>
-<h2>We are pleased to announce Entgra IoT Server 3.6.0.</h2>
+<h2>We are pleased to announce Entgra IoT Server 3.7.0.</h2>
-<p>Entgra IoT Server is the successor of WSO2 IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 3.6.0 pays special focus to Kiosk devices and many other EMM improvements.
+<p>Entgra IoT Server is the successor of WSO2 IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 3.7.0 pays special focus to Kiosk devices and many other EMM improvements.
 </p>
-<h4>What's new in Entgra IoTS 3.6.0</h4>
+<h4>What's new in Entgra IoTS 3.7.0</h4>
 <ul>
 	<li>Ability to add operations to groups/lists of devices</li>
@ -44,7 +44,7 @@ Documentations: <a href='https://entgra.atlassian.net/wiki/spaces/IoTS350/overvi
 <h4>Known Issues</h4>
-The known set of issues this version can be found <a href='https://gitlab.com/entgra/product-iots/issues?scope=all&utf8=%E2%9C%93&state=opened&milestone_title=IoT%203.6.0-GA'> here.</a>
+The known set of issues this version can be found <a href='https://gitlab.com/entgra/product-iots/issues?scope=all&utf8=✓&state=opened&milestone_title=IoT%203.7.0-GA'> here.</a>
 <h3>Engaging with Community</h3>
--- a/modules/distribution/src/core/samples/device-plugins-deployer.xml
+++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml
@ -27,7 +27,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.wso2.iot.devicemgt-plugins</groupId>
    <artifactId>iot-devicetype-feature-installation</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - IoT Core</name>
    <url>http://wso2.org</url>
--- 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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
--- 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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.0-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>org.wso2.iot</groupId>
        <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>mobile-qsg</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.7.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/mobile-qsg/resources/Readme.txt
+++ b/modules/scripts/mobile-qsg/resources/Readme.txt
@ -1,5 +1,5 @@
-WSO2 IoTs 3.6.0 QSG Setup Guide
+WSO2 IoTs 3.7.0 QSG Setup Guide
 ---------------------------------
 1. Start the WSO2 IoTS server
--- 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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>iot-devicetype-archetype</artifactId>
-    <version>3.6.0-SNAPSHOT</version>
+    <version>3.7.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.6.0-SNAPSHOT</version>
+        <version>3.7.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.6.0-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
    <name>WSO2 IoT - Parent</name>
    <url>http://wso2.org</url>
    <description>WSO2 IoT Server</description>