Fix IoT device deploying issue

.gitlab-ci.yml

@@ -4,7 +4,7 @@ variables:
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
   MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
-  # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
+  # As of Maven 3.4.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
   # when running from the command line.
   # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
   MAVEN_CLI_OPTS: "--batch-mode --errors --show-version"

README.md

@@ -53,11 +53,11 @@ http://docs.wso2.com/iot-server.
 * Support for SCEP protocol (encryption and authenticity)
 
 ### How to Run
-* Extract the downloaded wso2iot-3.3.0.zip file; this will create a folder named ‘wso2iot-3.3.0’.
+* Extract the downloaded wso2iot-3.4.0.zip file; this will create a folder named ‘wso2iot-3.4.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.3.0/bin/broker.sh [.bat]
+    * wso2iot-3.4.0/bin/broker.sh [.bat]
-    * wso2iot-3.3.0/bin/iot-server.sh [.bat]
+    * wso2iot-3.4.0/bin/iot-server.sh [.bat]
-    * wso2iot-3.3.0/bin/analytics.sh [.bat]
+    * wso2iot-3.4.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.3.0</version>
+    <version>3.4.0</version>
     <packaging>pom</packaging>
     <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - Analytics</name>
     <url>http://wso2.org</url>
@@ -66,6 +66,11 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
+
+                                <!-- Android Sense Device Type Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -94,6 +99,10 @@
                                     <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
@@ -199,6 +208,38 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
+        <repository>
+            <id>entgra-nexus</id>
+            <name>Entgra internal Repository</name>
+            <url>http://nexus.entgra.io/repository/maven-public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
+        <repository>
+            <id>entgra.releases</id>
+            <name>Entgra internal Repository</name>
+            <url>http://nexus.entgra.io/repository/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
+        <repository>
+            <id>entgra.snapshots</id>
+            <name>Entgra Snapshot Repository</name>
+            <url>http://nexus.entgra.io/repository/maven-snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
     </repositories>
 
     <properties>

modules/distribution/src/assembly/filter.properties

@@ -18,7 +18,7 @@
 
 product.name=WSO2 IoT Server
 product.key=IoT
-product.version=3.3.0
+product.version=3.4.0
 product.doc.version=330
 
 carbon.version=4.4.26

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

@@ -36,7 +36,7 @@
     <!--
        Product Version
     -->
-    <Version>3.3.0</Version>
+    <Version>3.4.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.3.0\ -pid 5151
+echo   e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.4.0\ -pid 5151
 
 :END

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

@@ -8,15 +8,15 @@
 
 <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.3.0</h1>
+<h1>Release Note - WSO2 IoT Server Version 3.4.0</h1>
 
-<h2>We are pleased to announce WSO2 IoT Server 3.3.0.</h2>
+<h2>We are pleased to announce WSO2 IoT Server 3.4.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.3.0</h4>
+<h4>What's new in WSO2 IoTS 3.4.0</h4>
 
 <ul>
 	<li>Support for DEP(Apple Device Enrolment Program) </li>
@@ -41,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.3.0'> 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.4.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.3.0</version>
+    <version>3.4.0</version>
     <packaging>pom</packaging>
     <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - IoT Core</name>
     <url>http://wso2.org</url>
@@ -78,6 +78,14 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
+
+                                <!-- Android Sense Device Type Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.ui.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -123,6 +131,16 @@
                                     <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+
+                                <!-- Android Sense Device Type Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
@@ -156,6 +174,12 @@
                                     <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+
+                                <!-- Android Sense Device Type UI Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
@@ -189,6 +213,12 @@
                                     <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+
+                                <!-- Android Sense Device Type BE Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
@@ -271,6 +301,38 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
+        <repository>
+            <id>entgra-nexus</id>
+            <name>Entgra internal Repository</name>
+            <url>http://nexus.entgra.io/repository/maven-public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
+        <repository>
+            <id>entgra.releases</id>
+            <name>Entgra internal Repository</name>
+            <url>http://nexus.entgra.io/repository/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
+        <repository>
+            <id>entgra.snapshots</id>
+            <name>Entgra Snapshot Repository</name>
+            <url>http://nexus.entgra.io/repository/maven-snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
     </repositories>
 
     <properties>

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

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