diff --git a/issue_template.md b/issue_template.md
new file mode 100644
index 00000000..757e13ef
--- /dev/null
+++ b/issue_template.md
@@ -0,0 +1,18 @@
+**Description:**
+
+
+**Suggested Labels:**
+
+
+**Suggested Assignees:**
+
+
+**Affected Product Version:**
+
+**OS, DB, other environment details and versions:**
+
+**Steps to reproduce:**
+
+
+**Related Issues:**
+
\ No newline at end of file
diff --git a/modules/distribution/src/core/bin/iot-server.sh b/modules/distribution/src/core/bin/iot-server.sh
index a3ef3be0..ac4b12e3 100755
--- a/modules/distribution/src/core/bin/iot-server.sh
+++ b/modules/distribution/src/core/bin/iot-server.sh
@@ -332,6 +332,7 @@ do
-Diot.apimpublisher.https.port="9443" \
-Diot.apimstore.host="localhost" \
-Diot.apimstore.https.port="9443" \
+ -Dmqtt.broker.https.port="9446" \
org.wso2.carbon.bootstrap.Bootstrap $*
status=$?
done
diff --git a/modules/distribution/src/core/resources/profiles/backend/iot-server.sh b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh
index c182e1fd..530e0e7f 100755
--- a/modules/distribution/src/core/resources/profiles/backend/iot-server.sh
+++ b/modules/distribution/src/core/resources/profiles/backend/iot-server.sh
@@ -335,6 +335,7 @@ do
-Diot.apimpublisher.https.port="9443" \
-Diot.apimstore.host="localhost" \
-Diot.apimstore.https.port="9443" \
+ -Dmqtt.broker.https.port="9446" \
$NODE_PARAMS \
org.wso2.carbon.bootstrap.Bootstrap $*
status=$?
diff --git a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh
index b46482d9..897c9b53 100755
--- a/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh
+++ b/modules/distribution/src/core/resources/profiles/keymanager/iot-server.sh
@@ -335,6 +335,7 @@ do
-Diot.apimpublisher.https.port="9443" \
-Diot.apimstore.host="localhost" \
-Diot.apimstore.https.port="9443" \
+ -Dmqtt.broker.https.port="9446" \
$NODE_PARAMS \
org.wso2.carbon.bootstrap.Bootstrap $*
status=$?
diff --git a/modules/distribution/src/core/resources/profiles/manager/iot-server.sh b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh
index f21aa8d2..0e3483d7 100755
--- a/modules/distribution/src/core/resources/profiles/manager/iot-server.sh
+++ b/modules/distribution/src/core/resources/profiles/manager/iot-server.sh
@@ -335,6 +335,7 @@ do
-Diot.apimpublisher.https.port="9443" \
-Diot.apimstore.host="localhost" \
-Diot.apimstore.https.port="9443" \
+ -Dmqtt.broker.https.port="9446" \
$NODE_PARAMS \
org.wso2.carbon.bootstrap.Bootstrap $*
status=$?
diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java
index cc7f1576..5256761b 100644
--- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java
+++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java
@@ -230,7 +230,8 @@ public class CarbonServerManagerExtension {
if(this.isCoverageEnable) {
try {
log.info("Generating Jacoco code coverage...");
- this.generateCoverageReport(new File(this.carbonHome + File.separator + "repository" + File.separator + "components" + File.separator + "plugins" + File.separator));
+ this.generateCoverageReport(new File(this.carbonHome + File.separator + "wso2"
+ + File.separator + "components" + File.separator + "plugins" + File.separator));
} catch (IOException var7) {
log.error("Failed to generate code coverage ", var7);
throw new AutomationFrameworkException("Failed to generate code coverage ", var7);
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index 2b0ef4d4..044feb65 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -90,18 +90,17 @@
- copy-emma-dependencies
+ copy-jacoco-dependencies
compile
copy-dependencies
- ${project.build.directory}/emma
+ ${project.build.directory}/jacoco
jar
- emma
+ org.jacoco.agent
-
copy-secVerifier
compile
@@ -272,6 +271,10 @@
org.eclipse.paho
org.eclipse.paho.client.mqttv3
+
+ org.jacoco
+ org.jacoco.agent
+
diff --git a/modules/integration/tests-integration/src/test/resources/automation.xml b/modules/integration/tests-integration/src/test/resources/automation.xml
index 249ba192..0e5fe5a9 100644
--- a/modules/integration/tests-integration/src/test/resources/automation.xml
+++ b/modules/integration/tests-integration/src/test/resources/automation.xml
@@ -32,7 +32,7 @@
- false
+ true
diff --git a/modules/integration/tests-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/src/test/resources/instrumentation.txt
index 8f3eacdd..8e73b3de 100644
--- a/modules/integration/tests-integration/src/test/resources/instrumentation.txt
+++ b/modules/integration/tests-integration/src/test/resources/instrumentation.txt
@@ -14,6 +14,7 @@ org.wso2.carbon.device.mgt.input.adapter.extension_
org.wso2.carbon.device.mgt.input.adapter.mqtt_
org.wso2.carbon.device.mgt.input.adapter.thrift_
org.wso2.carbon.device.mgt.input.adapter.xmpp_
+org.wso2.carbon.device.mgt.input.adapter.http_
org.wso2.carbon.device.mgt.mobile.android_
org.wso2.carbon.device.mgt.mobile.windows_
org.wso2.carbon.device.mgt.mqtt.notification.listener_
@@ -32,4 +33,8 @@ org.wso2.carbon.certificate.mgt.core_
org.wso2.carbon.email.sender.core_
org.wso2.carbon.identity.jwt.client.extension_
org.wso2.carbon.identity.authenticator.backend.oauth_
-org.wso2.carbon.webapp.authenticator.framework_
\ No newline at end of file
+org.wso2.carbon.webapp.authenticator.framework_
+org.wso2.carbon.device.mgt.analytics.dashboard_
+org.wso2.carbon.complex.policy.decision.point_
+org.wso2.carbon.appmgt.mdm.osgiconnector_
+org.wso2.carbon.appmgt.mdm.restconnector_
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 bd736ca4..f6f6147a 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
@@ -2166,6 +2166,15 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS",
+
+
+ Status of android device that carries the id \u0027d24f870f390352a41000${DeviceID}\u0027 is ACTIVE
+
+ Assertion.response_data
+ false
+ 16
+
+
true
@@ -8702,6 +8711,159 @@ GEL4ZNjZ+jnwSkzwBU5vh/QS",
+
+
+
+
+ ${host}
+ ${https_port}
+
+
+ https
+
+ /api/device-mgt/android/v1.0/devices/d24f870f390352a4${DeviceID}
+ DELETE
+ true
+ false
+ true
+ false
+ HttpClient4
+ false
+
+
+
+
+
+
+ Authorization
+ Bearer ${access_token}
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ application/json
+
+
+
+
+
+
+ Android device that carries id \u0027d24f870f390352a4${DeviceID}\u0027 has successfully dis-enrolled
+
+ Assertion.response_data
+ false
+ 16
+
+
+
+
+
+
+
+ ${host}
+ ${https_port}
+
+
+ https
+
+ /api/device-mgt/android/v1.0/devices/d24f870f390352a4${DeviceID}/status
+ GET
+ true
+ false
+ true
+ false
+ HttpClient4
+ false
+
+
+
+
+
+
+ Authorization
+ Bearer ${access_token}
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ application/json
+
+
+
+
+
+
+ Status of android device that carries the id \u0027d24f870f390352a4${DeviceID}\u0027 is REMOVED
+
+ Assertion.response_data
+ false
+ 16
+
+
+
+
+
+
+
+ ${host}
+ ${https_port}
+
+
+ https
+
+ /api/device-mgt/android/v1.0/devices/d24f870f390352sssa4${DeviceID}/status
+ GET
+ true
+ false
+ true
+ false
+ HttpClient4
+ false
+
+
+
+
+
+
+ Authorization
+ Bearer ${access_token}
+
+
+ Content-Type
+ application/json
+
+
+ Accept
+ application/json
+
+
+
+
+
+
+ No Android device is found upon the id \u0027d24f870f390352sssa4${DeviceID}\u0027
+
+ Assertion.response_data
+ true
+ 16
+
+
+
+
+ 404
+
+ Assertion.response_code
+ false
+ 8
+
+
+
false
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json b/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json
index 2b158a47..86b0b010 100644
--- a/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json
+++ b/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json
@@ -5,7 +5,7 @@
},
"GET": {
"responseCode": "OK",
- "responseMessage": "Android device that carries the id \u0027d24f870f390352a41234\u0027 is enrolled"
+ "responseMessage": "Status of android device that carries the id \u0027d24f870f390352a41234\u0027 is ACTIVE"
},
"PUT": {
"responseCode": "Accepted",
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json b/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json
index b27f0abd..dd426c92 100644
--- a/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json
+++ b/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json
@@ -1,9 +1,10 @@
{
"POST": {
- "username":"PRIMARY/username123",
+ "basicUserInfo" : {"username":"PRIMARY/username123",
"firstname":"userfirstname",
"lastname":"userlastname",
- "emailAddress":"user123@gmail.com"
+ "emailAddress":"user123@gmail.com"},
+ "message":"Mail Server is not configured. Email invitation will not be sent."
},
"PUT": {
"username":"username123",
diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml
index 76c5611a..49d31d84 100644
--- a/modules/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@@ -91,20 +91,6 @@
maven-dependency-plugin
-
-
- copy-emma-dependencies
- compile
-
- copy-dependencies
-
-
- ${project.build.directory}/emma
- jar
- emma
-
-
-
copy-secVerifier
compile
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
index af4b314e..e0d27299 100644
--- a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
+++ b/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
@@ -32,7 +32,7 @@
- false
+ true
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties b/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties
deleted file mode 100644
index 9c48e81b..00000000
--- a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties
+++ /dev/null
@@ -1,105 +0,0 @@
-# -------------------------------------------------------------
-#
-# for user-editable property overrides use one of these options:
-#
-# (1) option-specific command line overrides, e.g.
-# -Dreport.txt.out.file=coverage.txt
-#
-# (2) '-p ' command line option,
-#
-# (3) 'emma.properties' resource placed somewhere in the classpath
-# (e.g., in \classes directory -- note that it does
-# not exist by default),
-#
-# (4) '-Demma.*' JVM options, e.g.
-# -Demma.report.txt.out.file=coverage.txt
-#
-# (5) 'emma.properties' JVM option pointing to a properties file
-# -Demma.properties=./myproperties.txt
-# -------------------------------------------------------------
-
-# -------------------------------------------------------------
-# logging properties:
-
-verbosity.level: none
-
-# classloading properties:
-
-#clsload.forced_delegation_filter:
-#clsload.through_delegation_filter: -*
-
-# -------------------------------------------------------------
-
-# instrumentation properties:
-
-instr.exclude_empty_classes: true
-instr.exclude_synthetic_methods: true
-instr.exclude_bridge_methods: true
-instr.do_suid_compensation: true
-
-# -------------------------------------------------------------
-
-# runtime properties:
-
-rt.control: false
-rt.control.host: localhost
-#rt.control.port: 44444
-
-rt.filelock: true
-#rt.filelock.portbase: 59141
-rt.filelock.maxtime: 120000
-rt.filelock.retries: 11
-
-# -------------------------------------------------------------
-
-# apprunner session data output properties:
-
-session.out.file: coverage.es
-session.out.merge: true
-
-# -------------------------------------------------------------
-
-# runtime coverage data output properties:
-
-coverage.out.file: coverage.ec
-coverage.out.merge: true
-
-# -------------------------------------------------------------
-
-# instr metadata output properties:
-
-metadata.out.file: coverage.em
-metadata.out.merge: true
-
-# -------------------------------------------------------------
-
-# common report defaults:
-
-report.units: instr
-report.depth: method
-report.columns: name, line, block, method, class
-report.sort: -line,-block,-method,-class,+name
-report.metrics: method:40,block:80,line:40,class:100
-
-# -------------------------------------------------------------
-# txt report properties:
-
-report.txt.depth: all
-report.txt.columns: class,method,block,line,name
-report.txt.out.file: coverage.txt
-
-# -------------------------------------------------------------
-# html report properties:
-
-#report.html.out.dir: coverage
-#report.html.out.file: /Users/azeez/Desktop/coverage/index.html
-report.html.out.encoding: ISO-8859-1
-
-# -------------------------------------------------------------
-# xml report properties:
-
-#report.xml.out.file: coverage.xml
-report.xml.out.encoding: UTF-8
-# -------------------------------------------------------------
-# end of file
-
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index d92277b1..19049281 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -755,11 +755,19 @@
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
+<<<<<<< HEAD
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.remote.session.feature:${carbon.device.mgt.plugin.version}
+=======
+
+
+
+ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version}
+
+>>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
@@ -1644,6 +1652,11 @@
+
+
+ org.wso2.carbon.andes.extensions.device.mgt.api.feature.group
+ ${carbon.device.mgt.plugin.version}
+
@@ -2528,12 +2541,20 @@
${carbon.device.mgt.plugin.version}
+<<<<<<< HEAD
org.wso2.carbon.device.mgt.remote.session.feature.group
${carbon.device.mgt.plugin.version}
+=======
+
+
+ org.wso2.carbon.andes.extensions.device.mgt.api.feature.group
+ ${carbon.device.mgt.plugin.version}
+
+>>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
@@ -3168,12 +3189,20 @@
${carbon.device.mgt.plugin.version}
+<<<<<<< HEAD
org.wso2.carbon.device.mgt.remote.session.feature.group
${carbon.device.mgt.plugin.version}
+=======
+
+
+ org.wso2.carbon.andes.extensions.device.mgt.api.feature.group
+ ${carbon.device.mgt.plugin.version}
+
+>>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
diff --git a/modules/scripts/change-ip.sh b/modules/scripts/change-ip.sh
index 669a55bb..7519a2b5 100644
--- a/modules/scripts/change-ip.sh
+++ b/modules/scripts/change-ip.sh
@@ -64,7 +64,7 @@ echo "Completed!!"
#--------------------
echo "Changing /repository/deployment/server/jaggeryapps/api-store/site/conf/site.json"
-sed -i -e 's/"identityProvider.*/\"identityProviderUrl\"\ :\ "https\:\/\/'$val2':9443\/samlsso\"\,/' ../repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
+sed -i -e 's/"identityProvider.*/\"identityProviderURL\"\ :\ "https\:\/\/'$val2':9443\/samlsso\"\,/' ../repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
echo "Completed!!"
#--------------------
diff --git a/pom.xml b/pom.xml
index 56624a8e..1ddf28a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
org.wso2.carbon.automation
org.wso2.carbon.automation.engine
- ${test.framework.version}
+ ${platform.integration.utils.version}
org.slf4j
@@ -1517,17 +1517,20 @@
4.7.8
- 3.0.93-SNAPSHOT
+
+ 3.0.112
+
[3.0.0, 4.0.0)
${project.version}
- 4.0.66-SNAPSHOT
+ 4.0.82
+
- 6.1.95
+ 6.1.109
(6.0.0,7.0.0]
@@ -1555,8 +1558,8 @@
${project.version}
- 3.2.19
- 3.2.15
+ 3.2.25
+ 3.2.16
1.51.0.0
@@ -1596,7 +1599,7 @@
4.4.2
4.2.7
3.3.0
- 0.7.4.201502262128
+ 0.7.5.201505241946
1.1.1
3.3.2
2.2
@@ -1629,7 +1632,7 @@
1.0.1
- 1.2.35
+ 1.2.40
1.5.1
@@ -1760,10 +1763,6 @@
-
- maven-assembly-plugin
- 3.0.0
-
org.apache.maven.plugins
maven-project-info-reports-plugin