diff --git a/README.md b/README.md
index 85b398ae..159acb2f 100644
--- a/README.md
+++ b/README.md
@@ -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.4.0.zip file; this will create a folder named ‘entgraiot-3.4.0’.
+* Extract the downloaded entgraiot-3.6.0.zip file; this will create a folder named ‘entgraiot-3.6.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.4.0/bin/broker.sh [.bat]
- * entgraiot-3.4.0/bin/iot-server.sh [.bat]
- * entgraiot-3.4.0/bin/analytics.sh [.bat]
+ * entgraiot-3.6.0/bin/broker.sh [.bat]
+ * entgraiot-3.6.0/bin/iot-server.sh [.bat]
+ * entgraiot-3.6.0/bin/analytics.sh [.bat]
### How to Contribute
diff --git a/modules/distribution/src/analytics/samples/device-plugins/pom.xml b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
index 33560cf5..9052c483 100644
--- a/modules/distribution/src/analytics/samples/device-plugins/pom.xml
+++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
@@ -27,7 +27,7 @@
4.0.0
org.wso2.iot.analytics.devicemgt-plugins
analytics-devicetype-feature-installation
- 3.4.0-SNAPSHOT
+ 3.6.0
pom
Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - Analytics
http://wso2.org
diff --git a/modules/distribution/src/core/bin/carbondump.bat b/modules/distribution/src/core/bin/carbondump.bat
index 7dc68fff..9f8515ee 100644
--- 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.4.0\ -pid 5151
+echo e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.6.0\ -pid 5151
:END
diff --git a/modules/distribution/src/core/release-notes.html b/modules/distribution/src/core/release-notes.html
index 3dca7d50..b50d732e 100644
--- a/modules/distribution/src/core/release-notes.html
+++ b/modules/distribution/src/core/release-notes.html
@@ -8,29 +8,34 @@
-Release Note - Entgra IoT Server Version 3.5.0
+Release Note - Entgra IoT Server Version 3.6.0
-We are pleased to announce Entgra IoT Server 3.5.0.
+We are pleased to announce Entgra IoT Server 3.6.0.
-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.5.0 pays special focus to Kiosk devices and many other EMM improvements.
+
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.
-What's new in Entgra IoTS 3.5.0
+What's new in Entgra IoTS 3.6.0
- - Policy to install apps at device enrollment time
- - Policy to configure global HTTP Proxy on devices
- - Notify enrollment complete status to external systems
- - QR code based Kiosk and COPE device enrollment
- - Multi app and single app Kiosk support
- - Policy for custom theming and idle timeout videos support for Kiosks
- - User session support for Kiosk(Shared device)
- - Remote configurable secure browser support for Kiosk
- - OpenVPN configuration policy for Android
- - iOS application blacklisting and whitelisting support
- - Background Enrollment triggering from external apps(iOS and Android)
- - Android TV OS support
- - Multiple bug fixes and improvements in UI and APIs
+ - Ability to add operations to groups/lists of devices
+ - Install certificates in iOS and Android devices
+ - Ability to add third party applictions as VPN providers for Android devices (Always on VPN)
+ - Ability to measure data usage in Android Devices
+ - New Restrictions for Android Devices in Device Owner Mode
+ - Disallow set wallpaper
+ - Disallow Bluetooth
+ - Disallow Bluetooth sharing
+ - Disallow data roaming
+ - Disallow set user icon
+ - Disallow remote management profile
+ - Disallow remove user
+ - Disallow autofill
+ - Improvements to Android Kiosk Mode
+ - Support for iOS Kiosk Mode
+ - New API to install/remove external profiles on Apple devices.
+ - New API to permanently delete devices
+ - New API to query devices based on device properties
Documentation
@@ -39,7 +44,7 @@ Documentations: here.
+The known set of issues this version can be found here.
Engaging with Community
diff --git a/modules/distribution/src/core/samples/device-plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml
index 7436b64f..9805e595 100644
--- a/modules/distribution/src/core/samples/device-plugins-deployer.xml
+++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml
@@ -27,7 +27,7 @@
4.0.0
org.wso2.iot.devicemgt-plugins
iot-devicetype-feature-installation
- 3.4.0-SNAPSHOT
+ 3.6.0
pom
Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - IoT Core
http://wso2.org
diff --git a/modules/scripts/mobile-qsg/resources/Readme.txt b/modules/scripts/mobile-qsg/resources/Readme.txt
index 745e68f5..8e4b733a 100644
--- a/modules/scripts/mobile-qsg/resources/Readme.txt
+++ b/modules/scripts/mobile-qsg/resources/Readme.txt
@@ -1,5 +1,5 @@
-WSO2 IoTs 3.4.0 QSG Setup Guide
+WSO2 IoTs 3.6.0 QSG Setup Guide
---------------------------------
1. Start the WSO2 IoTS server
diff --git a/pom.xml b/pom.xml
index d22dad67..1f33be62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1528,14 +1528,15 @@
4.7.23
- 3.2.7-SNAPSHOT
+ 3.2.9-SNAPSHOT
+
[3.1.0, 4.0.0)
${project.version}
- 4.2.7-SNAPSHOT
+ 4.2.9-SNAPSHOT
6.2.201
@@ -1639,9 +1640,6 @@
1.0.1
-
- 1.5.5
-
1.5.1