diff --git a/README.md b/README.md index 739437b6..665821b8 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ WSO2 IoT Server is a complete solution that enables device manufacturers and ent It also offers a complete and secure enterprise mobility management (EMM/MDM) solution that aims to address mobile computing challenges faced by enterprises today. Supporting iOS, Android, and Windows devices, it helps organizations deal with both corporate owned, personally enabled (COPE) and employee-owned devices with the bring your own device (BYOD) concept. -WSO2 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. +WSO2 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 : http://docs.wso2.com/iot-server. @@ -27,11 +27,11 @@ http://docs.wso2.com/iot-server. * Share device operations/data with other users * Distribute and manage applications/firmware of devices * Edge computing powered by the WSO2 Complex Event Processor (CEP) streaming engine (Siddhi - https://github.com/wso2/siddhi) -* Out of the Box support for some known device types such as Raspberry Pi, Arduino Uno,...etc +* Out of the Box support for some known device types such as Raspberry Pi, Arduino Uno etc. * Supports mobile platforms such as Android, Windows, and iOS. #### Mobile Device and App Management -* Implement self-service device enrollment and management for iOS, Android and Windows devices +* Implement self-service device enrollment and management for iOS, Android, and Windows devices * Provide policy-driven device and profile management for security, data, and device features * Enable compliance monitoring for applied policies on devices and role-based access control * Provision/de-provision apps to multiple enrolled devices per user and to enrolled devices based on roles @@ -58,16 +58,16 @@ http://docs.wso2.com/iot-server. * Support for SCEP protocol (encryption and authenticity) ### How to Run -* Extract the downloaded wso2iot-3.0.0.zip file; this will create a folder named ‘wso2iot-3.0.0’. -* IoT Server comes with three runnable components namely broker, analytics and core. Start these components in following order by executing wso2server.sh [.bat] - * wso2iot-3.0.0/broker/bin - * wso2iot-3.0.0/core/bin - * wso2iot-3.0.0/analytics/bin +* Extract the downloaded wso2iot-3.1.0.zip file; this will create a folder named ‘wso2iot-3.1.0’. +* IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing 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] ### How to Contribute * WSO2 IoT Server code is hosted in [GitHub](https://github.com/wso2/product-iots). -* Please report issues at [IoTS JIRA](https://wso2.org/jira/browse/IOTS) and Send your pull requests to [development branch](https://github.com/wso2/product-iots). +* Please report issues at [IoT Server Git Issues](https://github.com/wso2/product-iots/issues) and Send your pull requests to [development branch](https://github.com/wso2/product-iots). ### Contact us diff --git a/modules/distribution/src/analytics/samples/device-plugins/pom.xml b/modules/distribution/src/analytics/samples/device-plugins/pom.xml index 4076c1b5..bccfdf50 100644 --- a/modules/distribution/src/analytics/samples/device-plugins/pom.xml +++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml @@ -29,7 +29,7 @@ analytics-devicetype-feature-installation 3.1.0-SNAPSHOT pom - Install Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - Analytics + Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - Analytics http://wso2.org diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 2c476d60..3f2ba054 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -1267,6 +1267,14 @@ README.txt 644 + + + ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt + ${pom.artifactId}-${pom.version}/bin + true + 644 + + src/core/LICENSE.txt ${pom.artifactId}-${pom.version} diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index e27e6d46..01dd7232 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -18,7 +18,7 @@ product.name=WSO2 IoT Server product.key=IoT -product.version=3.1.0-SNAPSHOT +product.version=3.1.0 product.doc.version=310 carbon.version=4.4.16 diff --git a/modules/distribution/src/core/README b/modules/distribution/src/core/README index c0538982..aec08167 100644 --- a/modules/distribution/src/core/README +++ b/modules/distribution/src/core/README @@ -42,7 +42,7 @@ Running all runtimes (IoT, Analytics, Broker) ================================================================== 1. Extract wso2iot-@product.version@.zip and go to the extracted directory/bin. -2. Run start-all.sh or start-all.bat. +2. Run broker.sh (or broker.bat), then the iot-server.sh (iot-server.bat) and finally analytics.sh (or analytics.bat). 3. Access appropriate url for the related runtime. (For example, use https://localhost:9443/devicemgt for the IoT Server runtime) diff --git a/modules/distribution/src/core/bin/iot-server.bat b/modules/distribution/src/core/bin/iot-server.bat index 5489845a..051c4eaa 100644 --- a/modules/distribution/src/core/bin/iot-server.bat +++ b/modules/distribution/src/core/bin/iot-server.bat @@ -154,6 +154,7 @@ rem ----------------- Execute The Requested Command ---------------------------- cd %CARBON_HOME% rem ------------------ Remove tmp folder on startup ----------------------------- +IF NOT EXIST %CARBON_HOME%\tmp mkdir %CARBON_HOME%\tmp\work set TMP_DIR=%CARBON_HOME%\tmp cd "%TMP_DIR%" del *.* /s /q > nul diff --git a/modules/distribution/src/core/bin/profile-creator.bat b/modules/distribution/src/core/bin/profile-creator.bat index d115e122..83ca0597 100644 --- a/modules/distribution/src/core/bin/profile-creator.bat +++ b/modules/distribution/src/core/bin/profile-creator.bat @@ -109,10 +109,6 @@ goto :eof mkdir %DIR%..\repository\deployment\server\webapps for /R %DIR%..\repository\deployment\server\tempwebapp %%f in (*.war) do copy %%f %DIR%..\repository\deployment\server\webapps\ IF EXIST %DIR%..\repository\deployment\server\tempwebapp @RD /S /Q %DIR%..\repository\deployment\server\tempwebapp - IF EXIST %DIR%start-all.bat del %DIR%start-all.bat - IF EXIST %DIR%start-all.sh del %DIR%start-all.sh - IF EXIST %DIR%stop-all.bat del %DIR%stop-all.bat - IF EXIST %DIR%stop-all.sh del %DIR%stop-all.sh call :RENAME_DIST echo Key Manager profile created successfully in %TEMPDIR%\%DISTRIBUTION%%PROFILE%. goto Exit @@ -145,10 +141,6 @@ goto :eof mkdir %DIR%..\repository\deployment\server\jaggeryapps mkdir %DIR%..\repository\deployment\server\axis2services IF EXIST %DIR%..\conf\identity\sso-idp-config.xml del %DIR%..\conf\identity\sso-idp-config.xml - IF EXIST %DIR%start-all.bat del %DIR%start-all.bat - IF EXIST %DIR%start-all.sh del %DIR%start-all.sh - IF EXIST %DIR%stop-all.bat del %DIR%stop-all.bat - IF EXIST %DIR%stop-all.sh del %DIR%stop-all.sh call :RENAME_DIST echo Device Backend profile created successfully in %TEMPDIR%\%DISTRIBUTION%%PROFILE%. goto Exit @@ -189,10 +181,6 @@ goto :eof for /R %DIR%..\repository\deployment\server\tempwebapp %%f in (*.war) do copy %%f %DIR%..\repository\deployment\server\webapps\ IF EXIST %DIR%..\conf\identity\sso-idp-config.xml del %DIR%..\conf\identity\sso-idp-config.xml IF EXIST %DIR%..\repository\deployment\server\tempwebapp @RD /S /Q %DIR%..\repository\deployment\server\tempwebapp - IF EXIST %DIR%start-all.bat del %DIR%start-all.bat - IF EXIST %DIR%start-all.sh del %DIR%start-all.sh - IF EXIST %DIR%stop-all.bat del %DIR%stop-all.bat - IF EXIST %DIR%stop-all.sh del %DIR%stop-all.sh call :RENAME_DIST echo Device Manager profile created successfully in %TEMPDIR%\%DISTRIBUTION%%PROFILE%. goto Exit @@ -272,10 +260,6 @@ goto :eof IF EXIST %DIR%chpasswd.sh del %DIR%chpasswd.sh IF EXIST %DIR%ciphertool.bat del %DIR%ciphertool.bat IF EXIST %DIR%ciphertool.sh del %DIR%ciphertool.sh - IF EXIST %DIR%start-all.bat del %DIR%start-all.bat - IF EXIST %DIR%start-all.sh del %DIR%start-all.sh - IF EXIST %DIR%stop-all.bat del %DIR%stop-all.bat - IF EXIST %DIR%stop-all.sh del %DIR%stop-all.sh goto :eof :Remove_JARS diff --git a/modules/distribution/src/core/bin/start-all.bat b/modules/distribution/src/core/bin/start-all.bat deleted file mode 100644 index 2bf84b06..00000000 --- a/modules/distribution/src/core/bin/start-all.bat +++ /dev/null @@ -1,78 +0,0 @@ -@echo off - -REM --------------------------------------------------------------------------- -REM Copyright 2017 WSO2, Inc. http://www.wso2.org -REM -REM Licensed under the Apache License, Version 2.0 (the "License"); -REM you may not use this file except in compliance with the License. -REM You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. - -rem --------------------------------------------------------------------------- -rem Main Script for WSO2 Carbon -rem -rem Environment Variable Prequisites -rem -rem CARBON_HOME Home of CARBON installation. If not set I will try -rem to figure it out. -rem -rem JAVA_HOME Must point at your Java Development Kit installation. -rem -rem JAVA_OPTS (Optional) Java runtime options used when the commands -rem is executed. -rem --------------------------------------------------------------------------- - -rem --------- NOTE: This is an edited wso2server.sh script to facilitate -rem spark environment variables for WSO2DAS! - -rem ----- if JAVA_HOME is not set we're not happy ------------------------------ -:checkJava - -if "%JAVA_HOME%" == "" goto noJavaHome -if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome -goto checkServer - -:noJavaHome -echo "You must set the JAVA_HOME variable before running CARBON." -goto end - -rem ----- Only set CARBON_HOME if not already set ---------------------------- -:checkServer -rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed -set CARBON_HOME=%~sdp0.. -echo "%CARBON_HOME%\bin\version.txt" -SET curDrive=%cd:~0,1% -SET wsasDrive=%CARBON_HOME:~0,1% -if not "%curDrive%" == "%wsasDrive%" %wsasDrive%: - -rem find CARBON_HOME if it does not exist due to either an invalid value passed -rem by the user or the %0 problem on Windows 9x -if not exist "%CARBON_HOME%\bin\version.txt" goto noServerHome - -goto startServers - -:noServerHome -echo CARBON_HOME is set incorrectly or CARBON could not be located. Please set CARBON_HOME. -echo %CARBON_HOME% -goto end - -:startServers -start %CARBON_HOME%\wso2\broker\bin\wso2server.bat --run -Dprofile="broker-default" -timeout /T 10 -start %CARBON_HOME%\bin\iot-server.bat --run -timeout /T 10 -start %CARBON_HOME%\wso2\analytics\bin\wso2server.bat --run -Dprofile="analytics-default" - - -:end -goto endlocal - -:endlocal -:END diff --git a/modules/distribution/src/core/bin/start-all.sh b/modules/distribution/src/core/bin/start-all.sh deleted file mode 100755 index 1b2b189a..00000000 --- a/modules/distribution/src/core/bin/start-all.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -#start-all.sh -# ---------------------------------------------------------------------------- -# Copyright 2016 WSO2, Inc. http://www.wso2.org -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -cygwin=false; -darwin=false; -os400=false; -mingw=false; -case "`uname`" in -CYGWIN*) cygwin=true;; -MINGW*) mingw=true;; -OS400*) os400=true;; -Darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - else - echo "Using Java version: $JAVA_VERSION" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home - fi - ;; -esac - -# resolve links - $0 may be a softlink -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -# Only set CARBON_HOME if not already set -[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd` - -########################################################################### -NAME=start-all -# Daemon name, where is the actual executable -IOT_INIT_SCRIPT="$CARBON_HOME/bin/iot-server.sh" -ANALYTICS_INIT_SCRIPT="$CARBON_HOME/wso2/analytics/bin/wso2server.sh" -BROKER_INIT_SCRIPT="$CARBON_HOME/wso2/broker/bin/wso2server.sh" - -# If the daemon is not there, then exit. - -if [ ! -z "$*" ]; then - exit; -else - trap "sh $CARBON_HOME/bin/stop-all.sh; exit;" INT TERM -fi -sh $BROKER_INIT_SCRIPT -Dprofile="broker-default" $* & -sleep 10 -sh $IOT_INIT_SCRIPT $* & -sleep 10 -sh $ANALYTICS_INIT_SCRIPT -Dprofile="analytics-default" $* & - - -if [ ! -z "$*" ]; then - exit; -else - trap "sh $CARBON_HOME/bin/stop-all.sh; exit;" INT TERM - while : - do - sleep 60 - done -fi diff --git a/modules/distribution/src/core/bin/stop-all.sh b/modules/distribution/src/core/bin/stop-all.sh deleted file mode 100755 index 9a62e79b..00000000 --- a/modules/distribution/src/core/bin/stop-all.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -#stop-all.sh -# ---------------------------------------------------------------------------- -# Copyright 2016 WSO2, Inc. http://www.wso2.org -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -# Only set CARBON_HOME if not already set -[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd` - -########################################################################### -NAME=stop-all -# Daemon name, where is the actual executables -IOT_INIT_SCRIPT="$CARBON_HOME/bin/iot-server.sh" -ANALYTICS_INIT_SCRIPT="$CARBON_HOME/wso2/analytics/bin/wso2server.sh" -MB_INIT_SCRIPT="$CARBON_HOME/wso2/broker/bin/wso2server.sh" - -sh $ANALYTICS_INIT_SCRIPT stop -sh $IOT_INIT_SCRIPT stop -sh $MB_INIT_SCRIPT stop - -exit diff --git a/modules/distribution/src/core/release-notes.html b/modules/distribution/src/core/release-notes.html index f4b4e774..dc18ed57 100644 --- a/modules/distribution/src/core/release-notes.html +++ b/modules/distribution/src/core/release-notes.html @@ -1,244 +1,63 @@ -Release Notes - WSO2 IOT Server - Version 3.0.0 + + + + + +WSO2 IoT Server +

+ +
+ +

Release Note - WSO2 IoT Server Version 3.1.0

+ +

We are pleased to announce WSO2 IoT Server 3.1.0.

+ +

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 wellas rich integration and smart analytics capabilities for system integrators to adopt devices into systems they build.

+ +

These capabilities involve device management, Smart Analytics, API/App management for devices, transport extensions for MQTT, XMPP and many more.

+ +

What's new in WSO2 IoTS 3.1.0

-

Bug -

- - -

Task -

- - -

Improvement -

- - - -

Sub-task -

\ No newline at end of file +
  • Complete API driven device type definition eliminating the necessity to create deployable plugins
    • +
  • Geo-fencing and alerting as a reusable functionality
    • +
  • Redesigned device overview page for better user experience
    • +
  • Improved product profiles for scalable deployment
    • +
  • Performance enhancements
    • +
  • Enhancements to prebuilt agents
    • + + +

    Documentation

    + +Documentations: WSO2 IoT Server Documentation + +

    Known Issues

    + +The known set of issues this version can be found here. + +

    Engaging with Community

    + +

    Mailing Lists

    + +

    Join our mailing list and correspondence with the developers directly.

    + +

    Developer list: dev@wso2.org | Subscribe | Mail Archive

    + +

    Reporting Issues

    + +

    We encourage you to report issues, documentation faults and feature requests regarding WSO2 IoT Server through WSO2 IoT GIT Issues.

    + +

    Discussion Forums

    + +

    We encourage you to use stackoverflow to engage with developers as well as other users.

    + +

    For more information about WSO2 IoT Server, please see http://wso2.com/products/iot-server or visit the WSO2 Oxygen Tank developer portal for additional resources.

    + +

    Thank you for your interest in WSO2 IoT Server.

    + +

    The WSO2 IoT Server Team

    + + + + + diff --git a/modules/distribution/src/core/resources/profiles/backend/iot-server.bat b/modules/distribution/src/core/resources/profiles/backend/iot-server.bat index aa69a55c..2b9d17ed 100644 --- a/modules/distribution/src/core/resources/profiles/backend/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/backend/iot-server.bat @@ -154,6 +154,7 @@ rem ----------------- Execute The Requested Command ---------------------------- cd %CARBON_HOME% rem ------------------ Remove tmp folder on startup ----------------------------- +IF NOT EXIST %CARBON_HOME%\tmp mkdir %CARBON_HOME%\tmp\work set TMP_DIR=%CARBON_HOME%\tmp cd "%TMP_DIR%" del *.* /s /q > nul diff --git a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat index f3d31b35..f24565a0 100644 --- a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.bat @@ -154,6 +154,7 @@ rem ----------------- Execute The Requested Command ---------------------------- cd %CARBON_HOME% rem ------------------ Remove tmp folder on startup ----------------------------- +IF NOT EXIST %CARBON_HOME%\tmp mkdir %CARBON_HOME%\tmp\work set TMP_DIR=%CARBON_HOME%\tmp cd "%TMP_DIR%" del *.* /s /q > nul diff --git a/modules/distribution/src/core/resources/profiles/manager/iot-server.bat b/modules/distribution/src/core/resources/profiles/manager/iot-server.bat index 3fcfc3fa..c8b8fa80 100644 --- a/modules/distribution/src/core/resources/profiles/manager/iot-server.bat +++ b/modules/distribution/src/core/resources/profiles/manager/iot-server.bat @@ -154,6 +154,7 @@ rem ----------------- Execute The Requested Command ---------------------------- cd %CARBON_HOME% rem ------------------ Remove tmp folder on startup ----------------------------- +IF NOT EXIST %CARBON_HOME%\tmp mkdir %CARBON_HOME%\tmp\work set TMP_DIR=%CARBON_HOME%\tmp cd "%TMP_DIR%" del *.* /s /q > nul diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java index d7bc3f59..0d2a1040 100644 --- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java +++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java @@ -86,8 +86,8 @@ public class MobileQSGTestCase extends TestBase { Constants.APPLICATION_JSON, accessTokenString); HttpResponse response = appManagerRestClient.get(Constants.QSGManagement.GET_MOBILE_APPS_ENDPONT); Assert.assertEquals(response.getResponseCode(), HttpStatus.SC_OK); - Assert.assertTrue(response.getData().contains("NFC"), - "NFC app addition through script is not successful"); + Assert.assertTrue(response.getData().contains("Con-App-Android"), + "Con-App-Android addition through script is not successful"); } @Test(description = "This test case tests the policy creation through qsg script", dependsOnMethods = {"executeQSGScript"}) diff --git a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx index c48f0eab..bd736ca4 100644 --- a/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx +++ b/modules/integration/tests-integration/src/test/resources/jmeter-scripts/NewAndroidDeviceManagementAPI.jmx @@ -1,5 +1,5 @@ - + @@ -4454,7 +4454,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true @@ -8660,7 +8660,7 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS", - + true diff --git a/modules/scripts/mobile-qsg/resources/apps/android/con-app.apk b/modules/scripts/mobile-qsg/resources/apps/android/con-app.apk new file mode 100644 index 00000000..dbb2a8b7 Binary files /dev/null and b/modules/scripts/mobile-qsg/resources/apps/android/con-app.apk differ diff --git a/modules/scripts/mobile-qsg/resources/apps/android/nfc-app.apk b/modules/scripts/mobile-qsg/resources/apps/android/nfc-app.apk deleted file mode 100644 index 088eaeeb..00000000 Binary files a/modules/scripts/mobile-qsg/resources/apps/android/nfc-app.apk and /dev/null differ diff --git a/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java b/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java index 9fc1a9fe..a4925c67 100644 --- a/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java +++ b/modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java @@ -116,7 +116,7 @@ public class QSGExecutor { System.out.println("Upload the android application "); //Upload the android application - MobileApplication application = AppOperations.uploadApplication(Constants.DeviceType.ANDROID, "nfc-app.apk", + MobileApplication application = AppOperations.uploadApplication(Constants.DeviceType.ANDROID, "con-app.apk", "application/vnd.android.package-archive"); if (application == null) { System.out.println("Unable to upload the sample android application. Terminating the IoTS QSG now."); @@ -132,7 +132,7 @@ public class QSGExecutor { System.out.println("Create the android application "); //Create application entry in publisher - status = AppOperations.addApplication("NFC", application, true); + status = AppOperations.addApplication("Con-App-Android", application, true); if (!status) { System.out.println("Unable to create the android mobile application. Terminating the IoTS QSG now."); System.exit(0); diff --git a/pom.xml b/pom.xml index 8349e6a5..348c83a8 100644 --- a/pom.xml +++ b/pom.xml @@ -1512,19 +1512,19 @@ 4.6.1 - 4.6.5 + 4.6.8 - 4.7.0 + 4.7.8 - 3.0.37 + 3.0.45 [3.0.0, 4.0.0) ${project.version} - 4.0.34 + 4.0.39 6.1.95 @@ -1629,7 +1629,7 @@ 1.0.1 - 1.2.33 + 1.2.34 1.5.1