Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.platform.configuration/public/js/platform-configuration.js

@@ -99,7 +99,7 @@ var addConfiguration = function () {
 var artifactUpload = function () {
 	var contentType = "application/json";
 	var backendEndBasePath = "/api/device-mgt/v1.0";
-	var urix = backendEndBasePath + "/admin/devicetype/deploy/android_sense";
+	var urix = backendEndBasePath + "/admin/publish-artifact/deploy/android_sense";
 	var defaultStatusClasses = "fw fw-stack-1x";
 	var content = $("#androidsense-statistic-response-template").find(".content");
 	var title = content.find("#title");

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.platform.configuration/public/js/platform-configuration.js

@@ -107,7 +107,7 @@ var addConfiguration = function () {
 var artifactUpload = function () {
 	var contentType = "application/json";
 	var backendEndBasePath = "/api/device-mgt/v1.0";
-	var urix = backendEndBasePath + "/admin/devicetype/deploy/arduino";
+	var urix = backendEndBasePath + "/admin/publish-artifact/deploy/arduino";
 	var defaultStatusClasses = "fw fw-stack-1x";
 	var content = $("#arduino-statistic-response-template").find(".content");
 	var title = content.find("#title");

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.platform.configuration/public/js/platform-configuration.js

@@ -117,7 +117,7 @@ var addConfiguration = function () {
 var artifactUpload = function () {
 	var contentType = "application/json";
 	var backendEndBasePath = "/api/device-mgt/v1.0";
-	var urix = backendEndBasePath + "/admin/devicetype/deploy/raspberrypi";
+	var urix = backendEndBasePath + "/admin/publish-artifact/deploy/raspberrypi";
 	var defaultStatusClasses = "fw fw-stack-1x";
 	var content = $("#raspberrypi-statistic-response-template").find(".content");
 	var title = content.find("#title");

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.platform.configuration/public/js/platform-configuration.js

@@ -107,7 +107,7 @@ var addConfiguration = function () {
 var artifactUpload = function () {
 	var contentType = "application/json";
 	var backendEndBasePath = "/api/device-mgt/v1.0";
-	var urix = backendEndBasePath + "/admin/devicetype/deploy/virtual_firealarm";
+	var urix = backendEndBasePath + "/admin/publish-artifact/deploy/virtual_firealarm";
 	var defaultStatusClasses = "fw fw-stack-1x";
 	var content = $("#virtual-firealarm-statistic-response-template").find(".content");
 	var title = content.find("#title");

features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml

@@ -159,7 +159,7 @@
                             <adviceFile>
                                 <properties>
                                     <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
-                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:true</propertyDef>
                                 </properties>
                             </adviceFile>
                             <bundles>