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

README.md

@@ -58,11 +58,11 @@ http://docs.wso2.com/iot-server.
 * Support for SCEP protocol (encryption and authenticity)
 
 ### How to Run
-* Extract the downloaded wso2iot-3.1.0.zip file; this will create a folder named ‘wso2iot-3.1.0’.
+* Extract the downloaded wso2iot-3.2.0.zip file; this will create a folder named ‘wso2iot-3.2.0’.
 * IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts:
-    * wso2iot-3.1.0//bin/broker.sh [.bat]
-    * wso2iot-3.1.0/bin/iot-server.sh [.bat]
-    * wso2iot-3.1.0/bin/analytics.sh [.bat]
+    * wso2iot-3.2.0//bin/broker.sh [.bat]
+    * wso2iot-3.2.0/bin/iot-server.sh [.bat]
+    * wso2iot-3.2.0/bin/analytics.sh [.bat]
 
 ### How to Contribute
 

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.1.0-update10-SNAPSHOT</version>
+    <version>3.2.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,7 +18,7 @@
 
 product.name=WSO2 IoT Server
 product.key=IoT
-product.version=3.1.0
+product.version=3.2.0
 product.doc.version=310
 
 carbon.version=4.4.16

modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties

@@ -466,7 +466,7 @@ org.owasp.csrfguard.unprotected.deviceMgtAcs=%servletContext%/uuf/sso/acs
 org.owasp.csrfguard.unprotected.deviceMgtApi=%servletContext%/devicemgt/api/*
 org.owasp.csrfguard.unprotected.storeEventPublisher=%servletContext%/store/apis/eventpublish/*
 org.owasp.csrfguard.unprotected.publisherAcs=%servletContext%/publisher/acs
-org.owasp.csrfguard.unprotected.publisherApi=%servletContext%/publisher/api
+org.owasp.csrfguard.unprotected.publisherApi=%servletContext%/publisher/api/*
 org.owasp.csrfguard.unprotected.storeAcs=%servletContext%/store/acs
 org.owasp.csrfguard.unprotected.apiStoreAcs=%servletContext%/api-store/acs
 org.owasp.csrfguard.unprotected.apiStoreApis=%servletContext%/api-store/apis/*

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

@@ -35,7 +35,7 @@
 
 <h4>Documentation</h4>
 
-Documentations: <a href='https://docs.wso2.com/display/IoTS310/WSO2+IoT+Server+Documentation'> WSO2 IoT Server Documentation</a> 
+Documentations: <a href='https://docs.wso2.com/display/IoTS320/WSO2+IoT+Server+Documentation'> WSO2 IoT Server Documentation</a>
 
 <h4>Known Issues</h4>
 

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

modules/scripts/change-superadmin-credentials.sh

@@ -89,9 +89,24 @@ sed -i -e 's#\(<property key="username">\)'$val1'\(</property>\)#\1'$val3'\2#g'
 sed -i -e 's#\(<property key="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../wso2/analytics/conf/input-event-adapters.xml
 echo "Completed!!"
 
+echo "Changing <IoT_HOME>/conf/input-event-adapters.xml"
+sed -i -e 's#\(<property key="username">\)'$val1'\(</property>\)#\1'$val3'\2#g' ../conf/input-event-adapters.xml
+sed -i -e 's#\(<property key="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../conf/input-event-adapters.xml
+echo "Completed!!"
+
+echo "Changing <IoT_HOME>/conf/output-event-adapters.xml"
+sed -i -e 's#\(<property key="username">\)'$val1'\(</property>\)#\1'$val3'\2#g' ../conf/output-event-adapters.xml
+sed -i -e 's#\(<property key="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../conf/output-event-adapters.xml
+echo "Completed!!"
+
 echo "Changing <IoT_HOME>/wso2/analytics/conf/output-event-adapters.xml"
-sed -i -e 's#\(<property key="username">\)'$val1'\(</property>\)#\1'$val3'\2#g' ../wso2/analytics/conf/input-event-adapters.xml
-sed -i -e 's#\(<property key="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../wso2/analytics/conf/input-event-adapters.xml
+sed -i -e 's#\(<property key="username">\)'$val1'\(</property>\)#\1'$val3'\2#g' ../wso2/analytics/conf/output-event-adapters.xml
+sed -i -e 's#\(<property key="password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../wso2/analytics/conf/output-event-adapters.xml
+echo "Completed!!"
+
+echo "Changing <IoT_HOME>/conf/etc/device-analytics-config.xml"
+sed -i -e 's#\(<AdminUsername">\)'$val1'\(</AdminUsername>\)#\1'$val3'\2#g' ../conf/etc/device-analytics-config.xml
+sed -i -e 's#\(<AdminPassword">\)'$val2'\(</AdminPassword>\)#\1'$val4'\2#g' ../conf/etc/device-analytics-config.xml
 echo "Completed!!"
 
 echo "Changing <IoT_HOME>/conf/user-mgt.xml"

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

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

pom.xml

@@ -1534,14 +1534,14 @@
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.0.231</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.240</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>4.0.131</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.0.136</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>