Merge branch 'master' of https://github.com/wso2/product-iot-server

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.2.0</version>
+    <version>3.3.0</version>
     <packaging>pom</packaging>
     <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - Analytics</name>
     <url>http://wso2.org</url>

modules/distribution/src/assembly/filter.properties

@@ -18,10 +18,10 @@
 
 product.name=WSO2 IoT Server
 product.key=IoT
-product.version=3.2.0
-product.doc.version=310
+product.version=3.3.0
+product.doc.version=330
 
-carbon.version=4.4.16
+carbon.version=4.4.26
 default.server.role=IoTServer
 cep.server.role=ComplexEventProcessor
 das.server.role=DataAnalyticsServer

modules/distribution/src/broker/conf/carbon.xml

@@ -36,7 +36,7 @@
     <!--
        Product Version
     -->
-    <Version>3.2.0</Version>
+    <Version>3.3.0</Version>
 
     <!--
        Host name or IP address of the machine hosting this server

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.2.0\ -pid 5151
+echo   e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.3.0\ -pid 5151
 
 :END

modules/distribution/src/core/release-notes.html

@@ -8,17 +8,19 @@
 
 <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 - WSO2 IoT Server Version 3.2.0</h1>
+<h1>Release Note - WSO2 IoT Server Version 3.3.0</h1>
 
-<h2>We are pleased to announce WSO2 IoT Server 3.2.0.</h2>
+<h2>We are pleased to announce WSO2 IoT Server 3.3.0.</h2>
 
 <p>WSO2 IoT Server is one of the most adaptive Apache licensed open source IoT platforms available today. It provides best of breed technologies for device manufacturers to develop connected products as well as rich integration and smart analytics capabilities for system integrators to adopt devices into systems they build. </p>
 
 <p>These capabilities involve device management, smart analytics, API and app management for devices, transport extensions for MQTT, XMPP and many more.</p>
 
-<h4>What's new in WSO2 IoTS 3.2.0</h4>
+<h4>What's new in WSO2 IoTS 3.3.0</h4>
 
 <ul>
+	<li>Support for DEP(Apple Device Enrolment Program) </li>
+	<li>GDPR compliance for privacy requirements</li>
 	<li>Remote Control and screen mirroring feature for android</li>
 	<li>Ability to enforce geolocation bound policies</li>
 	<li>Ability to enforce operations/policies on devices based on input from Analytics/CEP engine</li>
@@ -39,7 +41,7 @@ Documentations: <a href='https://docs.wso2.com/display/IoTS320/WSO2+IoT+Server+D
 
 <h4>Known Issues</h4>
 
-The known set of issues this version can be found <a href='https://github.com/wso2/product-iots/issues?q=is%3Aopen+is%3Aissue+label%3A3.2.0-RC1'> here.</a> 
+The known set of issues this version can be found <a href='https://github.com/wso2/product-iots/issues?q=is%3Aopen+is%3Aissue+label%3A3.3.0'> here.</a>
 
 <h3>Engaging with Community</h3>
 

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.2.0-SNAPSHOT</version>
+    <version>3.3.0</version>
     <packaging>pom</packaging>
     <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - IoT Core</name>
     <url>http://wso2.org</url>

modules/scripts/mobile-qsg/resources/Readme.txt

@@ -1,5 +1,5 @@
 
-WSO2 IoTs 3.2.0 QSG Setup Guide
+WSO2 IoTs 3.3.0 QSG Setup Guide
 ---------------------------------
 
 1. Start the WSO2 IoTS server

pom.xml

@@ -1677,7 +1677,7 @@
         <apache.httpclient.version>4.5.2</apache.httpclient.version>
 
         <!--Forget me tool version-->
-        <forgetme.tool.version>1.1.18</forgetme.tool.version>
+        <forgetme.tool.version>1.1.19</forgetme.tool.version>
 
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <identity.governance.version>1.0.38</identity.governance.version>