From 14e3e13c6b8b34aeb30b67ca10ad75da064f5d4e Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Mon, 29 Jan 2018 11:36:48 +0530 Subject: [PATCH] Fix https://github.com/wso2/product-iots/issues/773 --- modules/distribution/src/assembly/bin.xml | 14 ++++++++++++ .../plugin/impl/ConnectedCupManager.java | 5 +++++ .../impl/ConnectedCupManagerService.java | 22 ++++++++++++------- .../feature/backend-feature/pom.xml | 6 +++++ .../core/samples/sampledevice-deployer.xml | 2 +- .../sampledevice/api/DeviceTypeService.java | 0 .../api/DeviceTypeServiceImpl.java | 0 .../sampledevice/api/dto/DeviceJSON.java | 0 .../sampledevice/api/dto/SensorRecord.java | 0 .../api/exception/DeviceTypeException.java | 0 .../sampledevice/api/util/APIUtil.java | 0 .../sampledevice/api/util/ZipArchive.java | 0 .../sampledevice/api/util/ZipUtil.java | 0 .../plugin/constants/DeviceTypeConstants.java | 0 .../exception/DeviceMgtPluginException.java | 0 .../plugin/impl/DeviceTypeManager.java | 5 +++++ .../plugin/impl/DeviceTypeManagerService.java | 6 +++++ .../plugin/impl/dao/DeviceTypeDAO.java | 0 .../impl/dao/impl/DeviceTypeDAOImpl.java | 0 .../feature/DeviceTypeFeatureManager.java | 0 .../impl/util/DeviceSchemaInitializer.java | 0 .../plugin/impl/util/DeviceTypeUtils.java | 0 .../plugin/internal/ServiceComponent.java | 0 .../src/core/samples/sampledevice/pom.xml | 7 +++--- pom.xml | 4 ++-- 25 files changed, 56 insertions(+), 15 deletions(-) rename modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/api/DeviceTypeService.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/api/DeviceTypeServiceImpl.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/api/dto/DeviceJSON.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/api/dto/SensorRecord.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/api/exception/DeviceTypeException.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/api/util/APIUtil.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/api/util/ZipArchive.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/api/util/ZipUtil.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/constants/DeviceTypeConstants.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/exception/DeviceMgtPluginException.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/impl/DeviceTypeManager.java (98%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/impl/DeviceTypeManagerService.java (96%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/impl/dao/DeviceTypeDAO.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/impl/util/DeviceTypeUtils.java (100%) rename modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/{org.wso2.carbon => org/wso2/carbon}/sampledevice/plugin/internal/ServiceComponent.java (100%) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index e241ecd9..15d97bf8 100755 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -648,6 +648,8 @@ **/*connectedcup-samples-deployer.xml **/*connectedcup/pom.xml + **/*sampledevice/pom.xml + **/*sampledevice-deployer.xml **/*device-plugins-deployer.xml @@ -1690,12 +1692,24 @@ true 644 + + src/core/samples/sampledevice-deployer.xml + ${pom.artifactId}-${pom.version}/samples/ + true + 644 + src/core/samples/connectedcup/pom.xml ${pom.artifactId}-${pom.version}/samples/connectedcup/ true 644 + + src/core/samples/sampledevice/pom.xml + ${pom.artifactId}-${pom.version}/samples/sampledevice/ + true + 644 + diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java index 9f7604b1..5fb9244e 100644 --- a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java +++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java @@ -251,4 +251,9 @@ public class ConnectedCupManager implements DeviceManager { } return devices; } + + @Override + public boolean updateDeviceProperties(DeviceIdentifier deviceIdentifier, List list) throws DeviceManagementException { + return false; + } } \ No newline at end of file diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java index 5354abee..d74586ca 100644 --- a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java +++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java @@ -26,6 +26,7 @@ import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; import org.wso2.carbon.device.mgt.common.InitialOperationConfig; import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig; import org.wso2.carbon.device.mgt.common.ProvisioningConfig; +import org.wso2.carbon.device.mgt.common.general.GeneralConfig; import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager; import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager; import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber; @@ -35,6 +36,11 @@ import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; public class ConnectedCupManagerService implements DeviceManagementService { private DeviceManager deviceManager; + @Override + public void init() throws DeviceManagementException { + this.deviceManager = new ConnectedCupManager(); + } + @Override public String getType() { return ConnectedCupConstants.DEVICE_TYPE; @@ -45,11 +51,6 @@ public class ConnectedCupManagerService implements DeviceManagementService { return null; } - @Override - public void init() throws DeviceManagementException { - this.deviceManager = new ConnectedCupManager(); - } - @Override public DeviceManager getDeviceManager() { return deviceManager; @@ -76,17 +77,22 @@ public class ConnectedCupManagerService implements DeviceManagementService { } @Override - public DeviceStatusTaskPluginConfig getDeviceStatusTaskPluginConfig() { + public InitialOperationConfig getInitialOperationConfig() { return null; } @Override - public InitialOperationConfig getInitialOperationConfig() { + public PullNotificationSubscriber getPullNotificationSubscriber() { return null; } @Override - public PullNotificationSubscriber getPullNotificationSubscriber() { + public DeviceStatusTaskPluginConfig getDeviceStatusTaskPluginConfig() { + return null; + } + + @Override + public GeneralConfig getGeneralConfig() { return null; } } diff --git a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/pom.xml b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/pom.xml index 24fd6db7..d9c905d4 100644 --- a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/pom.xml +++ b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/pom.xml @@ -60,6 +60,12 @@ h2-database-engine 1.2.140.wso2v3 + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.server.feature + zip + ${carbon.device.mgt.version} + diff --git a/modules/distribution/src/core/samples/sampledevice-deployer.xml b/modules/distribution/src/core/samples/sampledevice-deployer.xml index b934486e..fd9dc107 100644 --- a/modules/distribution/src/core/samples/sampledevice-deployer.xml +++ b/modules/distribution/src/core/samples/sampledevice-deployer.xml @@ -190,6 +190,6 @@ - 4.0.34 + ${carbon.device.mgt.plugin.version} diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/DeviceTypeService.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeService.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/DeviceTypeService.java rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeService.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/DeviceTypeServiceImpl.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeServiceImpl.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/DeviceTypeServiceImpl.java rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/DeviceTypeServiceImpl.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/dto/DeviceJSON.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/DeviceJSON.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/dto/DeviceJSON.java rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/DeviceJSON.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/dto/SensorRecord.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/SensorRecord.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/dto/SensorRecord.java rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/dto/SensorRecord.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/exception/DeviceTypeException.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/exception/DeviceTypeException.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/exception/DeviceTypeException.java rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/exception/DeviceTypeException.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/util/APIUtil.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/APIUtil.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/util/APIUtil.java rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/APIUtil.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/util/ZipArchive.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipArchive.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/util/ZipArchive.java rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipArchive.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/util/ZipUtil.java b/modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipUtil.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org.wso2.carbon/sampledevice/api/util/ZipUtil.java rename to modules/distribution/src/core/samples/sampledevice/component/api/src/main/java/org/wso2/carbon/sampledevice/api/util/ZipUtil.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/constants/DeviceTypeConstants.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/constants/DeviceTypeConstants.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/constants/DeviceTypeConstants.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/constants/DeviceTypeConstants.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/exception/DeviceMgtPluginException.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/exception/DeviceMgtPluginException.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/exception/DeviceMgtPluginException.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/exception/DeviceMgtPluginException.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/DeviceTypeManager.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManager.java similarity index 98% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/DeviceTypeManager.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManager.java index d2840358..fa62356b 100644 --- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/DeviceTypeManager.java +++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManager.java @@ -259,4 +259,9 @@ public class DeviceTypeManager implements DeviceManager { } return devices; } + + @Override + public boolean updateDeviceProperties(DeviceIdentifier deviceIdentifier, List list) throws DeviceManagementException { + return false; + } } diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/DeviceTypeManagerService.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManagerService.java similarity index 96% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/DeviceTypeManagerService.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManagerService.java index cf53580d..9ecb5311 100644 --- a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/DeviceTypeManagerService.java +++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/DeviceTypeManagerService.java @@ -24,6 +24,7 @@ import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig; import org.wso2.carbon.device.mgt.common.InitialOperationConfig; import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; import org.wso2.carbon.device.mgt.common.ProvisioningConfig; +import org.wso2.carbon.device.mgt.common.general.GeneralConfig; import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager; import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager; import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber; @@ -114,4 +115,9 @@ public class DeviceTypeManagerService implements DeviceManagementService { return null; } + @Override + public GeneralConfig getGeneralConfig() { + return null; + } + } diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/dao/DeviceTypeDAO.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/DeviceTypeDAO.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/dao/DeviceTypeDAO.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/DeviceTypeDAO.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/dao/impl/DeviceTypeDAOImpl.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/feature/DeviceTypeFeatureManager.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceSchemaInitializer.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/util/DeviceTypeUtils.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceTypeUtils.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/impl/util/DeviceTypeUtils.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/impl/util/DeviceTypeUtils.java diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/internal/ServiceComponent.java b/modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/internal/ServiceComponent.java similarity index 100% rename from modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org.wso2.carbon/sampledevice/plugin/internal/ServiceComponent.java rename to modules/distribution/src/core/samples/sampledevice/component/plugin/src/main/java/org/wso2/carbon/sampledevice/plugin/internal/ServiceComponent.java diff --git a/modules/distribution/src/core/samples/sampledevice/pom.xml b/modules/distribution/src/core/samples/sampledevice/pom.xml index 6e833bb1..deeff3ae 100644 --- a/modules/distribution/src/core/samples/sampledevice/pom.xml +++ b/modules/distribution/src/core/samples/sampledevice/pom.xml @@ -374,12 +374,11 @@ - 4.4.11 + ${carbon.kernel.version} - 3.0.37 - 4.0.34 - + ${carbon.device.mgt.version} + ${carbon.device.mgt.plugin.version} ${project.groupId}.sampledevice diff --git a/pom.xml b/pom.xml index bf89dabf..f47792f5 100644 --- a/pom.xml +++ b/pom.xml @@ -1517,14 +1517,14 @@ 4.7.8 - 3.0.205 + 3.0.213-SNAPSHOT [3.0.0, 4.0.0) ${project.version} - 4.0.113 + 4.0.118-SNAPSHOT 6.1.109