From b1d501d7edd9cb7fa6db02c5e430b0ea0c1b8ec8 Mon Sep 17 00:00:00 2001 From: "amalka.subasinghe" Date: Mon, 14 Aug 2023 22:52:06 +0530 Subject: [PATCH 01/12] improved mqtt publisher to support any topic --- .../adapter/mqtt/MQTTEventAdapterFactory.java | 6 ++ .../mqtt/util/MQTTAdapterPublisher.java | 59 ++++++++++--------- .../MQTTBrokerConnectionConfiguration.java | 14 ++++- 3 files changed, 48 insertions(+), 31 deletions(-) diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java index dbea53923..6e63d8169 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/MQTTEventAdapterFactory.java @@ -94,12 +94,18 @@ public class MQTTEventAdapterFactory extends OutputEventAdapterFactory { qos.setOptions(new String[]{"0", "1", "2"}); qos.setDefaultValue("2"); + // set topic + Property topicProperty = new Property(MQTTEventAdapterConstants.ADAPTER_MESSAGE_TOPIC); + topicProperty.setDisplayName(resourceBundle.getString(MQTTEventAdapterConstants.ADAPTER_MESSAGE_TOPIC)); + topicProperty.setRequired(false); + staticPropertyList.add(brokerUrl); staticPropertyList.add(userName); staticPropertyList.add(scopes); staticPropertyList.add(clearSession); staticPropertyList.add(qos); staticPropertyList.add(password); + staticPropertyList.add(topicProperty); return staticPropertyList; } diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTAdapterPublisher.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTAdapterPublisher.java index d352cf105..17ea163bb 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTAdapterPublisher.java +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTAdapterPublisher.java @@ -17,37 +17,28 @@ */ package io.entgra.device.mgt.plugins.output.adapter.mqtt.util; +import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse; +import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest; +import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse; +import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.BadRequestException; +import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException; +import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtService; +import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtServiceImpl; +import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.ssl.Base64; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.message.BasicHeader; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; -import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse; -import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest; -import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse; -import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.BadRequestException; -import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException; -import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtService; -import io.entgra.device.mgt.core.apimgt.keymgt.extension.service.KeyMgtServiceImpl; +import org.jetbrains.annotations.NotNull; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.event.output.adapter.core.exception.ConnectionUnavailableException; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterRuntimeException; -import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; -import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; -import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.user.api.UserStoreException; /** @@ -153,6 +144,8 @@ public class MQTTAdapterPublisher { String dcrUrlString = this.mqttBrokerConnectionConfiguration.getDcrUrl(); if (dcrUrlString != null && !dcrUrlString.isEmpty()) { + PrivilegedCarbonContext.startTenantFlow(); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain, true); try { KeyMgtService keyMgtService = new KeyMgtServiceImpl(); String applicationName = MQTTEventAdapterConstants.APPLICATION_NAME_PREFIX @@ -170,6 +163,8 @@ public class MQTTAdapterPublisher { } catch (KeyMgtException e) { log.error("Failed to create an application.", e); throw new OutputEventAdapterRuntimeException("Failed to create an application.", e); + } finally { + PrivilegedCarbonContext.endTenantFlow(); } } throw new OutputEventAdapterRuntimeException("Invalid configuration for mqtt publisher"); @@ -177,27 +172,33 @@ public class MQTTAdapterPublisher { private String getToken(String clientId, String clientSecret) throws UserStoreException, JWTClientException { - PrivilegedCarbonContext.startTenantFlow(); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain, true); try { - String scopes = mqttBrokerConnectionConfiguration.getScopes(); - scopes += " perm:topic:pub:" + tenantDomain + ":+:+:operation"; - - TokenRequest tokenRequest = new TokenRequest(clientId, clientSecret, - null, scopes.toString(), "client_credentials", null, - null, null, null, Integer.MAX_VALUE); + TokenRequest tokenRequest = getTokenRequest(clientId, clientSecret); KeyMgtService keyMgtService = new KeyMgtServiceImpl(); TokenResponse tokenResponse = keyMgtService.generateAccessToken(tokenRequest); return tokenResponse.getAccessToken(); } catch (KeyMgtException | BadRequestException e) { log.error("Error while generating access token", e); - } finally { - PrivilegedCarbonContext.endTenantFlow(); } return null; } + @NotNull + private TokenRequest getTokenRequest(String clientId, String clientSecret) { + String scopes = mqttBrokerConnectionConfiguration.getScopes(); + scopes += " perm:topic:pub:" + tenantDomain + ":+:+:operation"; + + if (!StringUtils.isEmpty(mqttBrokerConnectionConfiguration.getTopic())) { + scopes += " perm:topic:pub:" + mqttBrokerConnectionConfiguration.getTopic().replace("/",":"); + } + + TokenRequest tokenRequest = new TokenRequest(clientId, clientSecret, + null, scopes.toString(), "client_credentials", null, + null, null, null, Integer.MAX_VALUE); + return tokenRequest; + } + private String getBase64Encode(String key, String value) { return new String(Base64.encodeBase64((key + ":" + value).getBytes())); } diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java index 4796483ac..576f111dd 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/output/adapter/mqtt/util/MQTTBrokerConnectionConfiguration.java @@ -17,8 +17,8 @@ */ package io.entgra.device.mgt.plugins.output.adapter.mqtt.util; +import org.apache.commons.lang3.StringUtils; import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterConfiguration; -import org.wso2.carbon.event.output.adapter.core.exception.OutputEventAdapterException; import java.util.Map; @@ -36,6 +36,8 @@ public class MQTTBrokerConnectionConfiguration { private boolean globalCredentailSet; private int qos; + private String topic; + public String getTokenUrl() { return tokenUrl; } @@ -79,6 +81,11 @@ public class MQTTBrokerConnectionConfiguration { public int getQos() { return qos; } + + public String getTopic() { + return topic; + } + public MQTTBrokerConnectionConfiguration(OutputEventAdapterConfiguration eventAdapterConfiguration, Map globalProperties) { adapterName = eventAdapterConfiguration.getName(); @@ -123,7 +130,10 @@ public class MQTTBrokerConnectionConfiguration { this.qos = Integer.parseInt(qosVal); } - + String topic = eventAdapterConfiguration.getStaticProperties().get(MQTTEventAdapterConstants.ADAPTER_MESSAGE_TOPIC); + if (!StringUtils.isEmpty(topic)) { + this.topic = topic; + } } } From 8188fc6b8bf880559e19482bb663a743607227af Mon Sep 17 00:00:00 2001 From: "amalka.subasinghe" Date: Fri, 18 Aug 2023 09:48:53 +0530 Subject: [PATCH 02/12] added logger --- .../pom.xml | 5 ++++ .../mgt/plugins/emqx/exhook/ExServer.java | 25 +++++++++---------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml index 12c1253b8..be3202f4a 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml @@ -74,6 +74,11 @@ io.entgra.device.mgt.core.device.mgt.core provided + + org.ops4j.pax.logging + pax-logging-api + provided + diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/src/main/java/io/entgra/device/mgt/plugins/emqx/exhook/ExServer.java b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/src/main/java/io/entgra/device/mgt/plugins/emqx/exhook/ExServer.java index 0e2233ee6..0d5d3d3a7 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/src/main/java/io/entgra/device/mgt/plugins/emqx/exhook/ExServer.java +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/src/main/java/io/entgra/device/mgt/plugins/emqx/exhook/ExServer.java @@ -23,6 +23,12 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.protobuf.ByteString; import com.google.protobuf.GeneratedMessageV3; +import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier; +import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo; +import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException; +import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager; +import io.entgra.device.mgt.core.device.mgt.core.config.keymanager.KeyManagerConfigurations; +import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.stub.StreamObserver; @@ -34,15 +40,8 @@ import org.apache.http.HttpStatus; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; -import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManager; -import io.entgra.device.mgt.core.device.mgt.core.config.keymanager.KeyManagerConfigurations; -import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder; -import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService; -import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo; -import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException; -import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier; -import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext; + import java.io.IOException; import java.util.*; import java.util.concurrent.TimeUnit; @@ -110,7 +109,7 @@ public class ExServer { public void DEBUG(String fn, Object req) { - System.out.printf(fn + ", request: " + req); + logger.debug(fn + ", request: " + req); } @Override @@ -493,8 +492,7 @@ public class ExServer { @Override public void onMessagePublish(MessagePublishRequest request, StreamObserver responseObserver) { - DEBUG("onMessagePublish", request); - + logger.info("onMessagePublish"); ByteString bstr = ByteString.copyFromUtf8("hardcode payload by exhook-svr-java :)"); Message nmsg = Message.newBuilder() @@ -538,7 +536,7 @@ public class ExServer { @Override public void onMessageDelivered(MessageDeliveredRequest request, StreamObserver responseObserver) { - DEBUG("onMessageDelivered", request); + logger.info("onMessageDelivered"); EmptySuccess reply = EmptySuccess.newBuilder().build(); responseObserver.onNext(reply); responseObserver.onCompleted(); @@ -554,10 +552,11 @@ public class ExServer { @Override public void onMessageDropped(MessageDroppedRequest request, StreamObserver responseObserver) { - DEBUG("onMessageDropped", request); + logger.info("onMessageDropped ---------------------------------------------------------------"); EmptySuccess reply = EmptySuccess.newBuilder().build(); responseObserver.onNext(reply); responseObserver.onCompleted(); + } From 558cb7753a4f383a9f2efbe6c332b72af76ee2f3 Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Fri, 25 Aug 2023 00:56:03 +0000 Subject: [PATCH 03/12] Update device mgt core to latest release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f96e95cd..a78116b94 100644 --- a/pom.xml +++ b/pom.xml @@ -1166,7 +1166,7 @@ - 5.0.29-SNAPSHOT + 5.0.29 [5.0.0, 6.0.0) From cfcea4f0199daf39101fb578195af7f5142fe6a6 Mon Sep 17 00:00:00 2001 From: builder Date: Fri, 25 Aug 2023 06:36:16 +0530 Subject: [PATCH 04/12] [maven-release-plugin] prepare release v6.0.20 --- components/device-types/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/device-types/virtual-fire-alarm-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.http/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/cdmf-transport-adapters/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.exhook/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.initializer/pom.xml | 2 +- components/extensions/emqx-extensions/pom.xml | 2 +- components/extensions/pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/pull-notification-listeners/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/siddhi-extensions/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android.api/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android/pom.xml | 2 +- components/mobile-plugins/android-plugin/pom.xml | 2 +- components/mobile-plugins/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.analytics.feature/pom.xml | 2 +- features/analytics-feature/pom.xml | 2 +- features/device-types-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../virtual-fire-alarm-plugin-feature/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.adapter.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/extensions-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../mobile-plugins-feature/android-plugin-feature/pom.xml | 2 +- features/mobile-plugins-feature/pom.xml | 2 +- pom.xml | 6 +++--- 44 files changed, 46 insertions(+), 46 deletions(-) diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml index 45c40063d..39b108175 100644 --- a/components/device-types/pom.xml +++ b/components/device-types/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml index 86e52ab2c..f72fed5e4 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml @@ -23,7 +23,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml index 9ae5ad8ed..d97e466b9 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml index 5ddc3d605..54e940179 100644 --- a/components/device-types/virtual-fire-alarm-plugin/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml index fba7cce02..bcd4c0e13 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml index 78440333f..ede6df394 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml index c811981a5..b6659feae 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml index 272fcc2fb..822cbac25 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml index 23891bf4c..c0ad8b9aa 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml index f18979eef..1a5dd3eaf 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml index 9742c1e76..0905b2d2b 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml index 02ba3d8f7..33b90b36c 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml index be5e58636..62d75a630 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml index d4a59825e..a70450d2c 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml index 96d9847a5..1fc80c17a 100644 --- a/components/extensions/cdmf-transport-adapters/pom.xml +++ b/components/extensions/cdmf-transport-adapters/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml index 12c1253b8..d20913248 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml index 93b5ed88a..394ed0c84 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml index 217c04429..7017cb573 100644 --- a/components/extensions/emqx-extensions/pom.xml +++ b/components/extensions/emqx-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml index 9ce2162de..369e8096d 100644 --- a/components/extensions/pom.xml +++ b/components/extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml index 252a283c4..170e7c577 100644 --- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml +++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins pull-notification-listeners - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml index 47289c4da..bbf06be31 100644 --- a/components/extensions/pull-notification-listeners/pom.xml +++ b/components/extensions/pull-notification-listeners/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index 4b9fbf81c..797d5332c 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml index 779213169..9c3ab4633 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml index c90e97ffb..4fbd654ab 100644 --- a/components/extensions/siddhi-extensions/pom.xml +++ b/components/extensions/siddhi-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml index 3321f2a7a..34831fe4b 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml index 1a231fdbd..6b063876d 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml index 2396b7af6..70bff22a1 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml @@ -23,7 +23,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml index a12d8e4e2..a04c6fd9f 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml @@ -22,7 +22,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml index a3dca947f..419935faf 100644 --- a/components/mobile-plugins/android-plugin/pom.xml +++ b/components/mobile-plugins/android-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml index c26f2b675..094482f8c 100644 --- a/components/mobile-plugins/pom.xml +++ b/components/mobile-plugins/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml index 23c832acf..fcdcd9317 100644 --- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml +++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins analytics-feature - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml index a77cd4895..b2faaa882 100644 --- a/features/analytics-feature/pom.xml +++ b/features/analytics-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml index 47704e42d..213f52335 100644 --- a/features/device-types-feature/pom.xml +++ b/features/device-types-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml index 0db9a2b41..052f62f93 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins virtual-fire-alarm-plugin-feature - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml index 8c40a315c..f1d52042f 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types-feature - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml index bf5135512..fe4f8bd9d 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml index 5a785dcc6..832697058 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml index 3a0216200..963f56e11 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml index b4fb06286..5fd6ed553 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml @@ -3,7 +3,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml 4.0.0 diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml index 5ad7af927..7c7d5a834 100644 --- a/features/extensions-feature/pom.xml +++ b/features/extensions-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml index 65e306f40..68d72c516 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins android-plugin-feature - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml index 85e116dcb..5ac6e9f99 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins-feature - 6.0.20-SNAPSHOT + 6.0.20 ../pom.xml diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml index 865d15e6e..4b67ba68f 100644 --- a/features/mobile-plugins-feature/pom.xml +++ b/features/mobile-plugins-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20-SNAPSHOT + 6.0.20 ../../pom.xml diff --git a/pom.xml b/pom.xml index a78116b94..893bd5883 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent pom - 6.0.20-SNAPSHOT + 6.0.20 WSO2 Carbon - Device Management Plugins Parent http://wso2.org WSO2 Carbon - Device Management Plugins Parent @@ -1170,7 +1170,7 @@ [5.0.0, 6.0.0) - 6.0.20-SNAPSHOT + 6.0.20 4.0.0 @@ -1361,7 +1361,7 @@ https://repository.entgra.net/community/device-mgt-plugins.git scm:git:https://repository.entgra.net/community/device-mgt-plugins.git scm:git:https://repository.entgra.net/community/device-mgt-plugins.git - v6.0.14 + v6.0.20 From 8459125178f72474b0be300ddcd80f22bef61691 Mon Sep 17 00:00:00 2001 From: builder Date: Fri, 25 Aug 2023 06:36:26 +0530 Subject: [PATCH 05/12] [maven-release-plugin] prepare for next development iteration --- components/device-types/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/device-types/virtual-fire-alarm-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.http/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/cdmf-transport-adapters/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.exhook/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.initializer/pom.xml | 2 +- components/extensions/emqx-extensions/pom.xml | 2 +- components/extensions/pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/pull-notification-listeners/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/siddhi-extensions/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android.api/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android/pom.xml | 2 +- components/mobile-plugins/android-plugin/pom.xml | 2 +- components/mobile-plugins/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.analytics.feature/pom.xml | 2 +- features/analytics-feature/pom.xml | 2 +- features/device-types-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../virtual-fire-alarm-plugin-feature/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.adapter.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/extensions-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../mobile-plugins-feature/android-plugin-feature/pom.xml | 2 +- features/mobile-plugins-feature/pom.xml | 2 +- pom.xml | 6 +++--- 44 files changed, 46 insertions(+), 46 deletions(-) diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml index 39b108175..3e12751b2 100644 --- a/components/device-types/pom.xml +++ b/components/device-types/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml index f72fed5e4..b6d6da8a8 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml @@ -23,7 +23,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml index d97e466b9..4ed9d1cba 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml index 54e940179..3591de9e3 100644 --- a/components/device-types/virtual-fire-alarm-plugin/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml index bcd4c0e13..c301c4351 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml index ede6df394..113954fd8 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml index b6659feae..e141fd7d7 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml index 822cbac25..fc2389981 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml index c0ad8b9aa..f0a872fda 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml index 1a5dd3eaf..2be081c56 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml index 0905b2d2b..7c5eb4d13 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml index 33b90b36c..721c017de 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml index 62d75a630..2ed0d608b 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml index a70450d2c..343a7e519 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml index 1fc80c17a..d0fe6afd1 100644 --- a/components/extensions/cdmf-transport-adapters/pom.xml +++ b/components/extensions/cdmf-transport-adapters/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml index d20913248..0166ab311 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml index 394ed0c84..77c06dbbe 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml index 7017cb573..bc2ab1372 100644 --- a/components/extensions/emqx-extensions/pom.xml +++ b/components/extensions/emqx-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml index 369e8096d..560ed2e06 100644 --- a/components/extensions/pom.xml +++ b/components/extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml index 170e7c577..a311ef7f6 100644 --- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml +++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins pull-notification-listeners - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml index bbf06be31..ebab33f1c 100644 --- a/components/extensions/pull-notification-listeners/pom.xml +++ b/components/extensions/pull-notification-listeners/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index 797d5332c..a16c8076a 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml index 9c3ab4633..843870f78 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml index 4fbd654ab..367be5f46 100644 --- a/components/extensions/siddhi-extensions/pom.xml +++ b/components/extensions/siddhi-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml index 34831fe4b..6ba396348 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml index 6b063876d..b0fd10299 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml index 70bff22a1..47e45cd63 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml @@ -23,7 +23,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml index a04c6fd9f..ba828d832 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml @@ -22,7 +22,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml index 419935faf..5c2460af2 100644 --- a/components/mobile-plugins/android-plugin/pom.xml +++ b/components/mobile-plugins/android-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml index 094482f8c..17146dd07 100644 --- a/components/mobile-plugins/pom.xml +++ b/components/mobile-plugins/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml index fcdcd9317..6c954bc3c 100644 --- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml +++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins analytics-feature - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml index b2faaa882..e5da2a2d6 100644 --- a/features/analytics-feature/pom.xml +++ b/features/analytics-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml index 213f52335..327bfa869 100644 --- a/features/device-types-feature/pom.xml +++ b/features/device-types-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml index 052f62f93..ca3625d25 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins virtual-fire-alarm-plugin-feature - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml index f1d52042f..34a308277 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types-feature - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml index fe4f8bd9d..5072f4be4 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml index 832697058..a36ee1128 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml index 963f56e11..ff99362cd 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml index 5fd6ed553..4f21483b0 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml @@ -3,7 +3,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml index 7c7d5a834..4726d814c 100644 --- a/features/extensions-feature/pom.xml +++ b/features/extensions-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml index 68d72c516..48acd6a1d 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins android-plugin-feature - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml index 5ac6e9f99..b3984c610 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins-feature - 6.0.20 + 6.0.21-SNAPSHOT ../pom.xml diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml index 4b67ba68f..74ba338f5 100644 --- a/features/mobile-plugins-feature/pom.xml +++ b/features/mobile-plugins-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.20 + 6.0.21-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 893bd5883..15cc14dc4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent pom - 6.0.20 + 6.0.21-SNAPSHOT WSO2 Carbon - Device Management Plugins Parent http://wso2.org WSO2 Carbon - Device Management Plugins Parent @@ -1170,7 +1170,7 @@ [5.0.0, 6.0.0) - 6.0.20 + 6.0.21-SNAPSHOT 4.0.0 @@ -1361,7 +1361,7 @@ https://repository.entgra.net/community/device-mgt-plugins.git scm:git:https://repository.entgra.net/community/device-mgt-plugins.git scm:git:https://repository.entgra.net/community/device-mgt-plugins.git - v6.0.20 + v6.0.14 From 40acfd4ab44cc9a2855a98aa1d34f59560665dd3 Mon Sep 17 00:00:00 2001 From: Charitha Goonetilleke Date: Mon, 28 Aug 2023 04:20:54 +0000 Subject: [PATCH 06/12] Update device mgt core to latest --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 15cc14dc4..2e1224f1e 100644 --- a/pom.xml +++ b/pom.xml @@ -1166,7 +1166,7 @@ - 5.0.29 + 5.0.30 [5.0.0, 6.0.0) From d662aa526459c2dc28d903c2062042b0075467ad Mon Sep 17 00:00:00 2001 From: builder Date: Mon, 28 Aug 2023 10:55:18 +0530 Subject: [PATCH 07/12] [maven-release-plugin] prepare release v6.0.21 --- components/device-types/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/device-types/virtual-fire-alarm-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.http/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/cdmf-transport-adapters/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.exhook/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.initializer/pom.xml | 2 +- components/extensions/emqx-extensions/pom.xml | 2 +- components/extensions/pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/pull-notification-listeners/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/siddhi-extensions/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android.api/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android/pom.xml | 2 +- components/mobile-plugins/android-plugin/pom.xml | 2 +- components/mobile-plugins/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.analytics.feature/pom.xml | 2 +- features/analytics-feature/pom.xml | 2 +- features/device-types-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../virtual-fire-alarm-plugin-feature/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.adapter.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/extensions-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../mobile-plugins-feature/android-plugin-feature/pom.xml | 2 +- features/mobile-plugins-feature/pom.xml | 2 +- pom.xml | 6 +++--- 44 files changed, 46 insertions(+), 46 deletions(-) diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml index 3e12751b2..b9c76db20 100644 --- a/components/device-types/pom.xml +++ b/components/device-types/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml index b6d6da8a8..e50497c0b 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml @@ -23,7 +23,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml index 4ed9d1cba..7114edfca 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml index 3591de9e3..d35e068f1 100644 --- a/components/device-types/virtual-fire-alarm-plugin/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml index c301c4351..aea0c7162 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml index 113954fd8..91b4ff909 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml index e141fd7d7..fa498f183 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml index fc2389981..d2b6e2588 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml index f0a872fda..3740a20de 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml index 2be081c56..bb9a7ddb1 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml index 7c5eb4d13..b13df6218 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml index 721c017de..dd476e40e 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml index 2ed0d608b..b2d8f9e36 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml index 343a7e519..bc77ac770 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml index d0fe6afd1..6f50a1377 100644 --- a/components/extensions/cdmf-transport-adapters/pom.xml +++ b/components/extensions/cdmf-transport-adapters/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml index ed49758a1..5f6046210 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml index 77c06dbbe..324d086cc 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml index bc2ab1372..448da073b 100644 --- a/components/extensions/emqx-extensions/pom.xml +++ b/components/extensions/emqx-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml index 560ed2e06..167b6c4aa 100644 --- a/components/extensions/pom.xml +++ b/components/extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml index a311ef7f6..57163c5ec 100644 --- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml +++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins pull-notification-listeners - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml index ebab33f1c..54e86ef83 100644 --- a/components/extensions/pull-notification-listeners/pom.xml +++ b/components/extensions/pull-notification-listeners/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index a16c8076a..c692f703b 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml index 843870f78..064fe3fa4 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml index 367be5f46..3896faa97 100644 --- a/components/extensions/siddhi-extensions/pom.xml +++ b/components/extensions/siddhi-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml index 6ba396348..5ad95cdef 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml index b0fd10299..9f8547d11 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml index 47e45cd63..bd32b67a6 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml @@ -23,7 +23,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml index ba828d832..601ce07f8 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml @@ -22,7 +22,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml index 5c2460af2..48dfd2fed 100644 --- a/components/mobile-plugins/android-plugin/pom.xml +++ b/components/mobile-plugins/android-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml index 17146dd07..9a84984f7 100644 --- a/components/mobile-plugins/pom.xml +++ b/components/mobile-plugins/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml index 6c954bc3c..c83102155 100644 --- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml +++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins analytics-feature - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml index e5da2a2d6..d7a7c173c 100644 --- a/features/analytics-feature/pom.xml +++ b/features/analytics-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml index 327bfa869..e57b28ddf 100644 --- a/features/device-types-feature/pom.xml +++ b/features/device-types-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml index ca3625d25..3180aebb6 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins virtual-fire-alarm-plugin-feature - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml index 34a308277..466a0cbbc 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types-feature - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml index 5072f4be4..610ea50de 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml index a36ee1128..0d7487f3a 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml index ff99362cd..5286c68dc 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml index 4f21483b0..c677f3fad 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml @@ -3,7 +3,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml 4.0.0 diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml index 4726d814c..f2a5adc12 100644 --- a/features/extensions-feature/pom.xml +++ b/features/extensions-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml index 48acd6a1d..021bd319d 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins android-plugin-feature - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml index b3984c610..33bc8a859 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins-feature - 6.0.21-SNAPSHOT + 6.0.21 ../pom.xml diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml index 74ba338f5..77f5e1f40 100644 --- a/features/mobile-plugins-feature/pom.xml +++ b/features/mobile-plugins-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21-SNAPSHOT + 6.0.21 ../../pom.xml diff --git a/pom.xml b/pom.xml index 2e1224f1e..a19f80320 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent pom - 6.0.21-SNAPSHOT + 6.0.21 WSO2 Carbon - Device Management Plugins Parent http://wso2.org WSO2 Carbon - Device Management Plugins Parent @@ -1170,7 +1170,7 @@ [5.0.0, 6.0.0) - 6.0.21-SNAPSHOT + 6.0.21 4.0.0 @@ -1361,7 +1361,7 @@ https://repository.entgra.net/community/device-mgt-plugins.git scm:git:https://repository.entgra.net/community/device-mgt-plugins.git scm:git:https://repository.entgra.net/community/device-mgt-plugins.git - v6.0.14 + v6.0.21 From 7faf5edcde4adad8f13bba2845f0dbe6ab88aaa4 Mon Sep 17 00:00:00 2001 From: builder Date: Mon, 28 Aug 2023 10:55:28 +0530 Subject: [PATCH 08/12] [maven-release-plugin] prepare for next development iteration --- components/device-types/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/device-types/virtual-fire-alarm-plugin/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.http/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/cdmf-transport-adapters/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.exhook/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.emqx.initializer/pom.xml | 2 +- components/extensions/emqx-extensions/pom.xml | 2 +- components/extensions/pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/pull-notification-listeners/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/extensions/siddhi-extensions/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android.api/pom.xml | 2 +- .../pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.mobile.android/pom.xml | 2 +- components/mobile-plugins/android-plugin/pom.xml | 2 +- components/mobile-plugins/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.analytics.feature/pom.xml | 2 +- features/analytics-feature/pom.xml | 2 +- features/device-types-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../virtual-fire-alarm-plugin-feature/pom.xml | 2 +- .../io.entgra.device.mgt.plugins.adapter.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/extensions-feature/pom.xml | 2 +- .../pom.xml | 2 +- .../mobile-plugins-feature/android-plugin-feature/pom.xml | 2 +- features/mobile-plugins-feature/pom.xml | 2 +- pom.xml | 6 +++--- 44 files changed, 46 insertions(+), 46 deletions(-) diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml index b9c76db20..5f30efd1b 100644 --- a/components/device-types/pom.xml +++ b/components/device-types/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml index e50497c0b..1248e5eb2 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml @@ -23,7 +23,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml index 7114edfca..030e8727d 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml @@ -21,7 +21,7 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml index d35e068f1..c79dfced0 100644 --- a/components/device-types/virtual-fire-alarm-plugin/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml index aea0c7162..cf1ce6dc5 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml index 91b4ff909..a39deed71 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml index fa498f183..76e67a38c 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml index d2b6e2588..f73d9d195 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml index 3740a20de..7dd03475e 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml index bb9a7ddb1..91c8e7f16 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml index b13df6218..464cdac72 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml index dd476e40e..c731b6466 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml index b2d8f9e36..852bd53c8 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml index bc77ac770..abf361eef 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml index 6f50a1377..5d2c10a88 100644 --- a/components/extensions/cdmf-transport-adapters/pom.xml +++ b/components/extensions/cdmf-transport-adapters/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml index 5f6046210..f72c9fe0f 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml index 324d086cc..3554482a9 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml @@ -21,7 +21,7 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml index 448da073b..9cf23bea3 100644 --- a/components/extensions/emqx-extensions/pom.xml +++ b/components/extensions/emqx-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml index 167b6c4aa..9ccf78a81 100644 --- a/components/extensions/pom.xml +++ b/components/extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml index 57163c5ec..bc67cf709 100644 --- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml +++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins pull-notification-listeners - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml index 54e86ef83..404810e11 100644 --- a/components/extensions/pull-notification-listeners/pom.xml +++ b/components/extensions/pull-notification-listeners/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index c692f703b..1731e8342 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml index 064fe3fa4..edcdc6cb6 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml index 3896faa97..c6b7c8531 100644 --- a/components/extensions/siddhi-extensions/pom.xml +++ b/components/extensions/siddhi-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml index 5ad95cdef..3612d22bf 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml index 9f8547d11..59339f7f6 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml @@ -21,7 +21,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml index bd32b67a6..deb7321fa 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml @@ -23,7 +23,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml index 601ce07f8..22eb04869 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml @@ -22,7 +22,7 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml index 48dfd2fed..8c203b1a6 100644 --- a/components/mobile-plugins/android-plugin/pom.xml +++ b/components/mobile-plugins/android-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml index 9a84984f7..121da625e 100644 --- a/components/mobile-plugins/pom.xml +++ b/components/mobile-plugins/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml index c83102155..2f9cab87b 100644 --- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml +++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins analytics-feature - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml index d7a7c173c..9c27799ea 100644 --- a/features/analytics-feature/pom.xml +++ b/features/analytics-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml index e57b28ddf..0ed29ebd9 100644 --- a/features/device-types-feature/pom.xml +++ b/features/device-types-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml index 3180aebb6..61487597b 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins virtual-fire-alarm-plugin-feature - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml index 466a0cbbc..f703f56c1 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types-feature - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml index 610ea50de..b4b0a1301 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml index 0d7487f3a..5c7bc18dd 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml index 5286c68dc..8b92a50f1 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml @@ -20,7 +20,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml index c677f3fad..a91ad3a8f 100644 --- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml +++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml @@ -3,7 +3,7 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml index f2a5adc12..6feda7f4b 100644 --- a/features/extensions-feature/pom.xml +++ b/features/extensions-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml index 021bd319d..44e97b99a 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins android-plugin-feature - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml index 33bc8a859..0d1595c5f 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins-feature - 6.0.21 + 6.0.22-SNAPSHOT ../pom.xml diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml index 77f5e1f40..60f918ea0 100644 --- a/features/mobile-plugins-feature/pom.xml +++ b/features/mobile-plugins-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.21 + 6.0.22-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index a19f80320..f596678f2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent pom - 6.0.21 + 6.0.22-SNAPSHOT WSO2 Carbon - Device Management Plugins Parent http://wso2.org WSO2 Carbon - Device Management Plugins Parent @@ -1170,7 +1170,7 @@ [5.0.0, 6.0.0) - 6.0.21 + 6.0.22-SNAPSHOT 4.0.0 @@ -1361,7 +1361,7 @@ https://repository.entgra.net/community/device-mgt-plugins.git scm:git:https://repository.entgra.net/community/device-mgt-plugins.git scm:git:https://repository.entgra.net/community/device-mgt-plugins.git - v6.0.21 + v6.0.14 From 83cdc1926256f792007b642835846b93006d0de4 Mon Sep 17 00:00:00 2001 From: Pahansith Gunathilake Date: Tue, 5 Sep 2023 07:07:52 +0000 Subject: [PATCH 09/12] Bump devicemgt core version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f596678f2..2cd8d6233 100644 --- a/pom.xml +++ b/pom.xml @@ -1166,7 +1166,7 @@ - 5.0.30 + 5.0.31-SNAPSHOT [5.0.0, 6.0.0) From 8180baefd9fc55062db51639bda0635c56be8d4e Mon Sep 17 00:00:00 2001 From: Viranga Gunarathna Date: Thu, 28 Sep 2023 00:00:44 +0530 Subject: [PATCH 10/12] Modify scope keys --- .../service/impl/VirtualFireAlarmService.java | 8 +- .../client/OAuthRequestInterceptor.java | 2 +- .../client/OAuthRequestInterceptor.java | 2 +- .../service/MQTTManagementAdminService.java | 4 +- .../client/OAuthRequestInterceptor.java | 2 +- .../client/OAuthRequestInterceptor.java | 2 +- .../DeviceManagementAdminService.java | 104 +++++++++--------- .../api/services/DeviceManagementService.java | 18 +-- .../DeviceTypeConfigurationService.java | 12 +- .../api/services/EventReceiverService.java | 6 +- .../private/config.json | 61 +++++----- 11 files changed, 111 insertions(+), 110 deletions(-) diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmService.java b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmService.java index 2dc782089..656dcea75 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmService.java +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/src/main/java/io/entgra/device/mgt/plugins/virtualfirealarm/api/service/impl/VirtualFireAlarmService.java @@ -53,7 +53,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Enroll device", description = "", - key = "perm:firealarm:enroll", + key = "dm:firealarm:enroll", permissions = {"/device-mgt/devices/enroll/firealarm"}, roles = {"Internal/devicemgt-user"} ) @@ -83,7 +83,7 @@ public interface VirtualFireAlarmService { tags = "virtual_firealarm", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:firealarm:enroll") + @ExtensionProperty(name = SCOPE, value = "dm:firealarm:enroll") }) } ) @@ -104,7 +104,7 @@ public interface VirtualFireAlarmService { tags = "virtual_firealarm", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:firealarm:enroll") + @ExtensionProperty(name = SCOPE, value = "dm:firealarm:enroll") }) } ) @@ -125,7 +125,7 @@ public interface VirtualFireAlarmService { tags = "virtual_firealarm", extensions = { @Extension(properties = { - @ExtensionProperty(name = SCOPE, value = "perm:firealarm:enroll") + @ExtensionProperty(name = SCOPE, value = "dm:firealarm:enroll") }) } ) diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/authorization/client/OAuthRequestInterceptor.java b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/authorization/client/OAuthRequestInterceptor.java index 513082af9..399039937 100755 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/authorization/client/OAuthRequestInterceptor.java +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/src/main/java/io/entgra/device/mgt/plugins/input/adapter/http/authorization/client/OAuthRequestInterceptor.java @@ -58,7 +58,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor { private static final String APPLICATION_NAME = "websocket-app"; private static final String PASSWORD_GRANT_TYPE = "password"; private static final String REFRESH_GRANT_TYPE = "refresh_token"; - private static final String REQUIRED_SCOPE = "perm:authorization:verify"; + private static final String REQUIRED_SCOPE = "dm:authorization:verify"; private ApiApplicationRegistrationService apiApplicationRegistrationService; private TokenIssuerService tokenIssuerService; diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java index 245275d34..1eaef1759 100755 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/src/main/java/io/entgra/device/mgt/plugins/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java @@ -70,7 +70,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor { private static final String APPLICATION_NAME = "websocket-app"; private static final String PASSWORD_GRANT_TYPE = "password"; private static final String REFRESH_GRANT_TYPE = "refresh_token"; - private static final String REQUIRED_SCOPE = "perm:authorization:verify"; + private static final String REQUIRED_SCOPE = "dm:authorization:verify"; private ApiApplicationRegistrationService apiApplicationRegistrationService; private TokenIssuerService tokenIssuerService; private ApiApplicationKey apiApplicationKey; diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/jaxrs/service/MQTTManagementAdminService.java b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/jaxrs/service/MQTTManagementAdminService.java index 96dfbaa0e..9057da87a 100644 --- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/jaxrs/service/MQTTManagementAdminService.java +++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/jaxrs/service/MQTTManagementAdminService.java @@ -64,7 +64,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Getting Details of Topics", description = "Getting Details of Topics", - key = "perm:admin:topics:view", + key = "dm:admin:topics:view", permissions = {"/device-mgt/topics/view"} ) } @@ -82,7 +82,7 @@ public interface MQTTManagementAdminService { tags = "MQTT Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:topics:view") + @ExtensionProperty(name = Constants.SCOPE, value = "dm:admin:topics:view") }) } ) diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java index 1cde68b66..9d91477eb 100755 --- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java +++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java @@ -58,7 +58,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor { private static final String APPLICATION_NAME = "mqtt_broker"; private static final String PASSWORD_GRANT_TYPE = "password"; private static final String REFRESH_GRANT_TYPE = "refresh_token"; - private static final String REQUIRED_SCOPE = "perm:authorization:verify"; + private static final String REQUIRED_SCOPE = "dm:authorization:verify"; private ApiApplicationRegistrationService apiApplicationRegistrationService; private TokenIssuerService tokenIssuerService; private static Log log = LogFactory.getLog(OAuthRequestInterceptor.class); diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/OAuthRequestInterceptor.java b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/OAuthRequestInterceptor.java index 9f0f18946..6d14f1cd6 100755 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/OAuthRequestInterceptor.java +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/main/java/io/entgra/device/mgt/plugins/extension/siddhi/device/client/OAuthRequestInterceptor.java @@ -50,7 +50,7 @@ import io.entgra.device.mgt.plugins.extension.siddhi.device.utils.DeviceUtils; public class OAuthRequestInterceptor implements RequestInterceptor { private static final String APPLICATION_NAME = "siddhi_extension_client"; - private static final String REQUIRED_SCOPES = "perm:devices:operations"; + private static final String REQUIRED_SCOPES = "dm:devices:ops:view"; private static final String[] API_TAGS = {"device_management"}; private DCRService dcrService; private static OAuthApplication oAuthApplication; diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java index 29a2b03f5..774370123 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java @@ -71,182 +71,182 @@ import java.util.List; @Scope( name = "Lock Device", description = "Hard lock own device", - key = "perm:android:lock-devices", + key = "and:ops:lock-devices", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/lock"} ), @Scope( name = "Unlock Device", description = "Unlock permanently locked device", - key = "perm:android:unlock-devices", + key = "and:ops:unlock-devices", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/unlock"} ), @Scope( name = "Get Location", description = "Request device location coordinates", - key = "perm:android:location", + key = "and:ops:location", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/location"} ), @Scope( name = "Clear Password", description = "Clear the password on Android devices", - key = "perm:android:clear-password", + key = "and:ops:clear-password", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/clear-password"} ), @Scope( name = "Control Camera", description = "Enabling or Disabling the Camera on Android Devices", - key = "perm:android:control-camera", + key = "and:ops:control-camera", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/camera"} ), @Scope( name = "Get Info", description = "Requesting device information from Android Devices", - key = "perm:android:info", + key = "and:ops:device-info", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/info"} ), @Scope( name = "Get Logs", description = "Requesting Logcat Details from Android Devices", - key = "perm:android:logcat", + key = "and:ops:logcat", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/logcat"} ), @Scope( name = "Enterprise Wipe", description = "Enterprise Wiping Android Devices", - key = "perm:android:enterprise-wipe", + key = "and:ops:enterprise-wipe", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/enterprise-wipe"} ), @Scope( name = "Factory Reset", description = "Factory Resetting Android Devices", - key = "perm:android:wipe", + key = "and:ops:wipe", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/wipe"} ), @Scope( name = "Get Installed Applications", description = "Get list of installed applications", - key = "perm:android:applications", + key = "and:ops:app-list", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/applications"} ), @Scope( name = "Ring Device", description = "Ring Android devices", - key = "perm:android:ring", + key = "and:ops:ring", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/ring"} ), @Scope( name = "Reboot Device", description = "Reboot Android devices", - key = "perm:android:reboot", + key = "and:ops:reboot", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/reboot"} ), @Scope( name = "Mute Device", description = "Mute Android devices", - key = "perm:android:mute", + key = "and:ops:mute", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/mute"} ), @Scope( name = "Install Applications", description = "Installing an Application on Android Devices", - key = "perm:android:install-application", + key = "and:ops:install-app", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/install-app"} ), @Scope( name = "Update Applications", description = "Updating an Application on Android Devices", - key = "perm:android:update-application", + key = "and:ops:update-app", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/update-app"} ), @Scope( name = "Uninstall Applications", description = "Uninstalling an Application on Android Devices", - key = "perm:android:uninstall-application", + key = "and:ops:uninstall-app", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/uninstall-app"} ), @Scope( name = "Blacklist Applications", description = "Blacklisting applications on Android Devices", - key = "perm:android:blacklist-applications", + key = "and:ops:blacklist-app", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/blacklist-app"} ), @Scope( name = "Upgrade Firmware", description = "Upgrading Firmware of Android Devices", - key = "perm:android:upgrade-firmware", + key = "and:ops:upgrade-firmware", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/upgrade"} ), @Scope( name = "Configure VPN", description = "Configure VPN on Android Device", - key = "perm:android:configure-vpn", + key = "and:ops:configure-vpn", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/vpn"} ), @Scope( name = "Send Notification", description = "Sending a notification to Android Device", - key = "perm:android:send-notification", + key = "and:ops:send-notif", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/send-notification"} ), @Scope( name = "Configure Wi-Fi", description = "Configure Wi-Fi on Android Device", - key = "perm:android:configure-wifi", + key = "and:ops:configure-wifi", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/wifi"} ), @Scope( name = "Encrypt Storage", description = "Encrypting storage on Android Device", - key = "perm:android:encrypt-storage", + key = "and:ops:encrypt-storage", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/encrypt"} ), @Scope( name = "Change Password", description = "Changing the lock code of an Android Device", - key = "perm:android:change-lock-code", + key = "and:ops:change-lock-code", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/change-lock-code"} ), @Scope( name = "Password Policy", description = "Set password policy of an Android Device", - key = "perm:android:set-password-policy", + key = "and:ops:password-policy", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/password-policy"} ), @Scope( name = "Add Web clip", description = "Setting a Web Clip on Android Devices", - key = "perm:android:set-webclip", + key = "and:ops:set-webclip", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/webclip"} ), @Scope( name = "File Transfer", description = "Transferring a file to android devices", - key = "perm:android:file-transfer", + key = "and:ops:file-transfer", roles = {"Internal/devicemgt-admin"}, permissions = {"/device-mgt/devices/owning-device/operations/android/file-transfer"} ) @@ -266,7 +266,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:file-transfer") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:file-transfer") }) } ) @@ -327,7 +327,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:lock-devices") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:lock-devices") }) } ) @@ -390,7 +390,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:unlock-devices") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:unlock-devices") }) } ) @@ -453,7 +453,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:location") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:location") }) } ) @@ -512,7 +512,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:clear-password") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:clear-password") }) } ) @@ -570,7 +570,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:control-camera") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:control-camera") }) }) @ApiResponses(value = { @@ -635,7 +635,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:info") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:device-info") }) } ) @@ -698,7 +698,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:logcat") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:logcat") }) } ) @@ -760,7 +760,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enterprise-wipe") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:enterprise-wipe") }) } ) @@ -820,7 +820,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:wipe") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:wipe") }) } ) @@ -884,7 +884,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:applications") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:app-list") }) } ) @@ -944,7 +944,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:ring") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:ring") }) } ) @@ -1004,7 +1004,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:reboot") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:reboot") }) } ) @@ -1064,7 +1064,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:mute") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:mute") }) } ) @@ -1126,7 +1126,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:install-application") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:install-app") }) } ) @@ -1191,7 +1191,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:update-application") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:update-app") }) } ) @@ -1253,7 +1253,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:uninstall-application") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:uninstall-app") }) } ) @@ -1319,7 +1319,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:blacklist-applications") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:blacklist-app") }) } ) @@ -1381,7 +1381,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:upgrade-firmware") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:upgrade-firmware") }) } ) @@ -1445,7 +1445,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:configure-vpn") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:configure-vpn") }) } ) @@ -1505,7 +1505,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:send-notification") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:send-notif") }) } ) @@ -1566,7 +1566,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:configure-wifi") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:configure-wifi") }) } ) @@ -1628,7 +1628,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:encrypt-storage") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:encrypt-storage") }) } ) @@ -1690,7 +1690,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:change-lock-code") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:change-lock-code") }) } ) @@ -1752,7 +1752,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:set-password-policy") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:password-policy") }) } ) @@ -1812,7 +1812,7 @@ public interface DeviceManagementAdminService { tags = "Android Device Management Administrative Service", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:set-webclip") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:set-webclip") }) } ) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java index aa010c399..ee422a3b7 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementService.java @@ -70,14 +70,14 @@ import java.util.List; @Scope( name = "Enroll Device", description = "Register an Android device", - key = "perm:android:enroll", + key = "and:devices:enroll", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/enroll/android"} ), @Scope( name = "Un-enroll Device", description = "Unregister an Android device", - key = "perm:android:disenroll", + key = "and:devices:disenroll", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/disenroll/android"} ) @@ -96,7 +96,7 @@ public interface DeviceManagementService { tags = "Android Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll") }) } ) @@ -161,7 +161,7 @@ public interface DeviceManagementService { tags = "Android Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll") }) } ) @@ -222,7 +222,7 @@ public interface DeviceManagementService { tags = "Android Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll") }) } ) @@ -284,7 +284,7 @@ public interface DeviceManagementService { tags = "Android Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll") }) } ) @@ -339,7 +339,7 @@ public interface DeviceManagementService { tags = "Android Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll") }) } ) @@ -392,7 +392,7 @@ public interface DeviceManagementService { tags = "Android Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll") }) } ) @@ -448,7 +448,7 @@ public interface DeviceManagementService { tags = "Android Device Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:disenroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:disenroll") }) } ) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java index 28665d340..85d90c335 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java @@ -67,21 +67,21 @@ import javax.ws.rs.core.Response; @Scope( name = "Enroll Device", description = "Register an Android device", - key = "perm:android:enroll", + key = "and:conf:devices:enroll", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/enroll/android"} ), @Scope( name = "View Configurations", description = "Getting Android Platform Configurations", - key = "perm:android:view-configuration", + key = "and:conf:view", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/enroll/android"} ), @Scope( name = "Manage Configurations", description = "Updating Android Platform Configurations", - key = "perm:android:manage-configuration", + key = "and:conf:manage", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/platform-configurations/manage"} ) @@ -99,7 +99,7 @@ public interface DeviceTypeConfigurationService { tags = "Android Configuration Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:view-configuration") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:conf:view") }) } ) @@ -153,7 +153,7 @@ public interface DeviceTypeConfigurationService { tags = "Android Configuration Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:manage-configuration") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:conf:manage") }) } ) @@ -208,7 +208,7 @@ public interface DeviceTypeConfigurationService { tags = "Android Configuration Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:conf:devices:enroll") }) } ) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java index 7fa858c07..cf8260c66 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java @@ -67,7 +67,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Enroll Device", description = "Register an Android device", - key = "perm:android:enroll", + key = "and:event:devices:enroll", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/enroll/android"} ) @@ -86,7 +86,7 @@ public interface EventReceiverService { tags = "Event Receiver", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:event:devices:enroll") }) } ) @@ -149,7 +149,7 @@ public interface EventReceiverService { tags = "Event Receiver", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "perm:android:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:event:devices:enroll") }) } ) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json index e6ab55c5d..4c9ba9545 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json @@ -6,36 +6,37 @@ "analyticsEnabled": "false", "groupingEnabled": "true", "scopes" : [ - "perm:android:file-transfer", - "perm:android:enroll", - "perm:android:wipe", - "perm:android:ring", - "perm:android:lock-devices", - "perm:android:configure-vpn", - "perm:android:configure-wifi", - "perm:android:enroll", - "perm:android:uninstall-application", - "perm:android:manage-configuration", - "perm:android:location", - "perm:android:install-application", - "perm:android:mute", - "perm:android:change-lock-code", - "perm:android:blacklist-applications", - "perm:android:set-password-policy", - "perm:android:encrypt-storage", - "perm:android:clear-password", - "perm:android:enterprise-wipe", - "perm:android:info", - "perm:android:view-configuration", - "perm:android:upgrade-firmware", - "perm:android:set-webclip", - "perm:android:send-notification", - "perm:android:disenroll", - "perm:android:update-application", - "perm:android:unlock-devices", - "perm:android:control-camera", - "perm:android:reboot", - "perm:android:logcat" + "and:ops:file-transfer", + "and:devices:enroll", + "and:ops:wipe", + "and:ops:ring", + "and:ops:lock-devices", + "and:ops:configure-vpn", + "and:ops:configure-wifi", + "and:conf:devices:enroll", + "and:event:devices:enroll", + "and:ops:uninstall-app", + "and:conf:manage", + "and:ops:location", + "and:ops:install-app", + "and:ops:mute", + "and:ops:change-lock-code", + "and:ops:blacklist-app", + "and:ops:password-policy", + "and:ops:encrypt-storage", + "and:ops:clear-password", + "and:ops:enterprise-wipe", + "and:ops:device-info", + "and:conf:view", + "and:ops:upgrade-firmware", + "and:ops:set-webclip", + "and:ops:send-notif", + "and:devices:disenroll", + "and:ops:update-app", + "and:ops:unlock-devices", + "and:ops:control-camera", + "and:ops:reboot", + "and:ops:logcat" ], "features": { "DEVICE_RING": { From 939b2c7e83692d1a02bdb8d66dd0991cbbf15835 Mon Sep 17 00:00:00 2001 From: Viranga Gunarathna Date: Thu, 28 Sep 2023 21:20:37 +0530 Subject: [PATCH 11/12] Duplicate keys for same permission in different files --- .../api/services/DeviceTypeConfigurationService.java | 4 ++-- .../mobile/android/api/services/EventReceiverService.java | 6 +++--- .../private/config.json | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java index 85d90c335..6ef1252dc 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java @@ -67,7 +67,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Enroll Device", description = "Register an Android device", - key = "and:conf:devices:enroll", + key = "and:devices:enroll", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/enroll/android"} ), @@ -208,7 +208,7 @@ public interface DeviceTypeConfigurationService { tags = "Android Configuration Management", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:conf:devices:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll") }) } ) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java index cf8260c66..af83e6c05 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java @@ -67,7 +67,7 @@ import javax.ws.rs.core.Response; @Scope( name = "Enroll Device", description = "Register an Android device", - key = "and:event:devices:enroll", + key = "and:devices:enroll", roles = {"Internal/devicemgt-user"}, permissions = {"/device-mgt/devices/enroll/android"} ) @@ -86,7 +86,7 @@ public interface EventReceiverService { tags = "Event Receiver", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:event:devices:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll") }) } ) @@ -149,7 +149,7 @@ public interface EventReceiverService { tags = "Event Receiver", extensions = { @Extension(properties = { - @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:event:devices:enroll") + @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll") }) } ) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json index 4c9ba9545..ece5617ae 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json @@ -13,8 +13,7 @@ "and:ops:lock-devices", "and:ops:configure-vpn", "and:ops:configure-wifi", - "and:conf:devices:enroll", - "and:event:devices:enroll", + "and:devices:enroll", "and:ops:uninstall-app", "and:conf:manage", "and:ops:location", From 789d5ada3d5c1f1d074e0754ab6aed6205f6917c Mon Sep 17 00:00:00 2001 From: Viranga Gunarathna Date: Thu, 12 Oct 2023 15:56:19 +0530 Subject: [PATCH 12/12] mapping permissions with scopes --- .../android/api/services/DeviceTypeConfigurationService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java index 6ef1252dc..f43af679b 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java @@ -76,14 +76,14 @@ import javax.ws.rs.core.Response; description = "Getting Android Platform Configurations", key = "and:conf:view", roles = {"Internal/devicemgt-user"}, - permissions = {"/device-mgt/devices/enroll/android"} + permissions = {"/device-mgt/platform-configurations/android/view"} ), @Scope( name = "Manage Configurations", description = "Updating Android Platform Configurations", key = "and:conf:manage", roles = {"Internal/devicemgt-user"}, - permissions = {"/device-mgt/platform-configurations/manage"} + permissions = {"/device-mgt/platform-configurations/android/manage"} ) } )