From 61f8589113f0303235180f244b585027132b1b0d Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Thu, 11 May 2023 14:38:47 +0530 Subject: [PATCH] refactored version variables, oauth extension component --- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.apimgt.handlers/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 6 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../org.wso2.carbon.device.mgt.ui/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 10 +- .../handlers/ScopeValidationHandler.java | 4 +- .../grant/AccessTokenGrantHandler.java | 6 +- .../grant/ExtendedJWTGrantHandler.java | 2 +- .../ExtendedSAML2BearerGrantHandler.java | 2 +- .../oauth/validator/LocalOAuthValidator.java | 4 +- .../validator/OAuthValidationResponse.java | 2 +- .../OAuthAuthenticatorDataHolder.java | 2 +- .../OAuthAuthenticatorServiceComponent.java | 4 +- .../OAuthExtensionServiceComponent.java | 6 +- .../internal/OAuthExtensionsDataHolder.java | 2 +- .../validators/AccessTokenGrantValidator.java | 4 +- .../ExtendedJDBCScopeValidator.java | 4 +- .../PermissionBasedScopeValidator.java | 4 +- .../validators/RoleBasedScopeValidator.java | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/identity-extensions/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/test-coverage/pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 8 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 6 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 10 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 10 +- features/oauth-extensions/pom.xml | 3 +- .../pom.xml | 2 +- .../pom.xml | 8 +- .../pom.xml | 2 +- .../pom.xml | 6 +- .../pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 2 +- pom.xml | 108 +++++++++--------- 100 files changed, 201 insertions(+), 202 deletions(-) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions => io.entgra.device.mgt.core.device.mgt.oauth.extensions}/pom.xml (93%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java (96%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java (95%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/handlers/grant/ExtendedJWTGrantHandler.java (96%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/handlers/grant/ExtendedSAML2BearerGrantHandler.java (95%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/handlers/grant/oauth/validator/LocalOAuthValidator.java (92%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/handlers/grant/oauth/validator/OAuthValidationResponse.java (94%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorDataHolder.java (94%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorServiceComponent.java (92%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/internal/OAuthExtensionServiceComponent.java (95%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/internal/OAuthExtensionsDataHolder.java (97%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/validators/AccessTokenGrantValidator.java (85%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/validators/ExtendedJDBCScopeValidator.java (98%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java (97%) rename components/identity-extensions/{org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon => io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core}/device/mgt/oauth/extensions/validators/RoleBasedScopeValidator.java (97%) diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml index 563f941e7a..68425f07e0 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml @@ -43,7 +43,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Grafana Management Common Bundle io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.* diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml index 636f512d33..e72e7b62b9 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml @@ -73,7 +73,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Grafana API Management Core Bundle io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.internal diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml index 965a9fb342..e19cb9e0f3 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml @@ -68,7 +68,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} API Management Application Bundle io.entgra.device.mgt.core.apimgt.application.extension.internal diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml index 5008a237ae..6fde8fc060 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml @@ -66,7 +66,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} API Management Extentions - Custom Annotations io.entgra.device.mgt.core.apimgt.annotations.* diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml index dbaf97ad9b..279733d44a 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml @@ -97,7 +97,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} API Management Application Bundle io.entgra.device.mgt.core.apimgt.application.extension.internal diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml index 7609cdfe96..d5f559ff34 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml @@ -96,7 +96,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Publisher API Management Bundle io.entgra.device.mgt.core.apimgt.extension.rest.api.internal diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml index 0670cb0419..e1d584a964 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml @@ -50,7 +50,7 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.keymgt.extension - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} provided diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml index 4771ae54eb..aac78c17e4 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml @@ -49,7 +49,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} API Management Application Bundle io.entgra.device.mgt.core.apimgt.keymgt.extension.internal diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml index 006c39bc73..024bf7660e 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml @@ -149,7 +149,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} API Management Webapp Publisher io.entgra.device.mgt.core.apimgt.webapp.publisher.internal diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml index d0d65a9b62..24ee2eb967 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml @@ -76,7 +76,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} WSO2 Carbon - API Security Handler Component org.apache.axiom.*, diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml index 39b74a2045..5ce4c88fa3 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml @@ -45,7 +45,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Application Management Add-Ons Bundle com.google.gson, diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml index 92c28e1f97..d6cb21f583 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml @@ -46,11 +46,11 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Application Management Common Bundle - io.entgra.device.mgt.core.device.mgt.common.*;version="${carbon.device.mgt.version}", - io.entgra.device.mgt.core.device.mgt.core.dto;version="${carbon.device.mgt.version}", + io.entgra.device.mgt.core.device.mgt.common.*;version="${io.entgra.device.mgt.core.version}", + io.entgra.device.mgt.core.device.mgt.core.dto;version="${io.entgra.device.mgt.core.version}", com.google.gson, io.swagger.annotations.*;resolution:=optional, com.fasterxml.jackson.annotation, diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml index 38fe2db9c7..2845ac4f9c 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml @@ -46,7 +46,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Application Management Core Bundle io.entgra.device.mgt.core.application.mgt.core.internal diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml index b88def811e..ddd6720485 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml @@ -64,7 +64,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Device Management Core Bundle io.entgra.device.mgt.core.certificate.mgt.core.internal, diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml index 393f3c5407..283d9b9743 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml @@ -57,7 +57,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} IoT - User Roles Management Bundle io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.internal diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml index 1af07bbc64..d0b9d6f50a 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml @@ -123,7 +123,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Device Type Deployer Bundle !io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.internal, diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml index b7d211c38a..71b60f8381 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml @@ -47,7 +47,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Entgra Logger Bundle io.entgra.device.mgt.core.device.mgt.extensions.logger, diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml index 9f8036f6ed..20a62eb833 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml @@ -75,7 +75,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Pull Notification Provider Bundle !io.entgra.device.mgt.core.device.mgt.extensions.pull.notification.internal, diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml index 2a3f1aeed4..073865a700 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml @@ -127,7 +127,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} FCM Based Push Notification Provider Bundle !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.internal, diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml index d70cf7c523..bdad0b4425 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml @@ -118,7 +118,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} MQTT Based Push Notification Provider Bundle !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.internal, diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml index e87f42bebd..5d72865c31 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml @@ -140,7 +140,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} MQTT Based Push Notification Provider Bundle !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.internal, diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml index c066507836..c9caa1c7d0 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml @@ -127,7 +127,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} XMPP Based Push Notification Provider Bundle !io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.internal, diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml index 8bd8c12652..cd3da29c98 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml @@ -52,7 +52,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} IoT Device Management State Engine Bundle org.wso2.carbon.context, diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml index 3536e30631..8a5d35696c 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml @@ -42,7 +42,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Device Management Common Bundle io.entgra.device.mgt.core.device.mgt.common.* diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml index 62aa61c5ad..6b7a46c8f2 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml @@ -73,7 +73,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Device Management Core Bundle io.entgra.device.mgt.core.device.mgt.core.internal diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml index 47e85752e9..12dd685758 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml @@ -152,7 +152,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Device Management Extensions Bundle !io.entgra.device.mgt.core.device.mgt.extensions.internal, diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml index a25e25aaaf..4ed6e7b2b8 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml @@ -57,7 +57,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} IoT Server Impl Bundle io.entgra.device.mgt.core.device.mgt.url.printer.internal diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml index 01befebbc8..d836b5d79e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml @@ -99,12 +99,12 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Data Publisher org.wso2.carbon.device.mgt.analytics.data.publisher.internal !org.wso2.carbon.device.mgt.analytics.data.publisher.internal, - org.wso2.carbon.device.mgt.analytics.data.publisher.*;version="${carbon.device.mgt.version}" + org.wso2.carbon.device.mgt.analytics.data.publisher.*;version="${io.entgra.device.mgt.core.version}" org.osgi.framework.*;version="${imp.package.version.osgi.framework}", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml index 6daac01524..e866e84aaf 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml @@ -39,7 +39,7 @@ maven-assembly-plugin 2.5.5 - ${project.artifactId}-${carbon.device.mgt.version} + ${project.artifactId}-${io.entgra.device.mgt.core.version} false src/assembly/src.xml diff --git a/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml index 6f3d5ff2d5..9f1cc8619f 100644 --- a/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml @@ -47,7 +47,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Server Startup Heart Beat Beacon Bundle io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.internal diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml similarity index 93% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml index 84a72e1f4c..054f9ed910 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.oauth.extensions + io.entgra.device.mgt.core.device.mgt.oauth.extensions bundle WSO2 Carbon - OAuth Extensions http://wso2.org @@ -74,12 +74,12 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} OAuth Extensions Bundle - org.wso2.carbon.device.mgt.oauth.extensions.internal + io.entgra.device.mgt.core.device.mgt.oauth.extensions.internal - !org.wso2.carbon.device.mgt.oauth.extensions.internal, - org.wso2.carbon.device.mgt.oauth.extensions.* + !io.entgra.device.mgt.core.device.mgt.oauth.extensions.internal, + io.entgra.device.mgt.core.device.mgt.oauth.extensions.* org.wso2.carbon.identity.oauth2.grant.jwt;version="${carbon.identity.jwt.grant.version.range}", diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java similarity index 96% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java index 38bae19058..97df2786f7 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/ScopeValidationHandler.java @@ -15,12 +15,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.handlers; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.oauth.extensions.internal.OAuthExtensionsDataHolder; +import io.entgra.device.mgt.core.device.mgt.oauth.extensions.internal.OAuthExtensionsDataHolder; import org.wso2.carbon.identity.oauth.cache.CacheEntry; import org.wso2.carbon.identity.oauth.cache.OAuthCache; import org.wso2.carbon.identity.oauth.cache.OAuthCacheKey; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java similarity index 95% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java index 92dd1ad814..be84f5d12f 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/AccessTokenGrantHandler.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.oauth.validator.LocalOAuthValidator; -import org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.oauth.validator.OAuthValidationResponse; +import io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.oauth.validator.LocalOAuthValidator; +import io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.oauth.validator.OAuthValidationResponse; import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser; import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException; import org.wso2.carbon.identity.application.common.model.ServiceProvider; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/ExtendedJWTGrantHandler.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/ExtendedJWTGrantHandler.java similarity index 96% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/ExtendedJWTGrantHandler.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/ExtendedJWTGrantHandler.java index 0fe613fa31..1b50a1ac44 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/ExtendedJWTGrantHandler.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/ExtendedJWTGrantHandler.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/ExtendedSAML2BearerGrantHandler.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/ExtendedSAML2BearerGrantHandler.java similarity index 95% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/ExtendedSAML2BearerGrantHandler.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/ExtendedSAML2BearerGrantHandler.java index 749cf84147..a79d6a330c 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/ExtendedSAML2BearerGrantHandler.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/ExtendedSAML2BearerGrantHandler.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/LocalOAuthValidator.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/LocalOAuthValidator.java similarity index 92% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/LocalOAuthValidator.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/LocalOAuthValidator.java index dd7872da35..9f6a0ec7f4 100755 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/LocalOAuthValidator.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/LocalOAuthValidator.java @@ -15,9 +15,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.oauth.validator; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.oauth.validator; -import org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.oauth.validator.internal.OAuthAuthenticatorDataHolder; +import io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.oauth.validator.internal.OAuthAuthenticatorDataHolder; import org.wso2.carbon.identity.oauth2.dto.OAuth2TokenValidationRequestDTO; import org.wso2.carbon.identity.oauth2.dto.OAuth2TokenValidationResponseDTO; import org.wso2.carbon.utils.multitenancy.MultitenantUtils; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/OAuthValidationResponse.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/OAuthValidationResponse.java similarity index 94% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/OAuthValidationResponse.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/OAuthValidationResponse.java index 75042177fb..8493890d82 100755 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/OAuthValidationResponse.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/OAuthValidationResponse.java @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.oauth.validator; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.oauth.validator; /** * This class holds the authenticated user information after the OAuth2 token is validated. diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorDataHolder.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorDataHolder.java similarity index 94% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorDataHolder.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorDataHolder.java index 85b32c04c5..0b9f784f04 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorDataHolder.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorDataHolder.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.oauth.validator.internal; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.oauth.validator.internal; import org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorServiceComponent.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorServiceComponent.java similarity index 92% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorServiceComponent.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorServiceComponent.java index 63407083b7..5b61bbd2f8 100755 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorServiceComponent.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/handlers/grant/oauth/validator/internal/OAuthAuthenticatorServiceComponent.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.oauth.validator.internal; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.oauth.validator.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,7 +24,7 @@ import org.osgi.service.component.ComponentContext; import org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService; /** - * @scr.component name="org.wso2.carbon.device.mgt.oauth.extensions.authenticator" immediate="true" + * @scr.component name="io.entgra.device.mgt.core.device.mgt.oauth.extensions.authenticator" immediate="true" * @scr.reference name="identity.oauth2.validation.service" * interface="org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService" * cardinality="1..1" diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/internal/OAuthExtensionServiceComponent.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/internal/OAuthExtensionServiceComponent.java similarity index 95% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/internal/OAuthExtensionServiceComponent.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/internal/OAuthExtensionServiceComponent.java index 881df6fd86..4402d6a7cb 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/internal/OAuthExtensionServiceComponent.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/internal/OAuthExtensionServiceComponent.java @@ -16,20 +16,20 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.internal; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.internal; +import io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators.ExtendedJDBCScopeValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.osgi.service.component.ComponentContext; -import org.wso2.carbon.device.mgt.oauth.extensions.validators.ExtendedJDBCScopeValidator; import org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService; import org.wso2.carbon.identity.oauth2.validators.JDBCScopeValidator; import org.wso2.carbon.identity.oauth2.validators.OAuth2ScopeValidator; import org.wso2.carbon.user.core.service.RealmService; /** - * @scr.component name="org.wso2.carbon.device.mgt.oauth.extensions" immediate="true" + * @scr.component name="io.entgra.device.mgt.core.device.mgt.oauth.extensions" immediate="true" * @scr.reference name="user.realmservice.default" * interface="org.wso2.carbon.user.core.service.RealmService" * cardinality="1..1" diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/internal/OAuthExtensionsDataHolder.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/internal/OAuthExtensionsDataHolder.java similarity index 97% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/internal/OAuthExtensionsDataHolder.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/internal/OAuthExtensionsDataHolder.java index 2c4f25705d..543a4fd9c0 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/internal/OAuthExtensionsDataHolder.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/internal/OAuthExtensionsDataHolder.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.internal; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.internal; import org.wso2.carbon.identity.oauth2.OAuth2TokenValidationService; import org.wso2.carbon.identity.oauth2.validators.OAuth2ScopeValidator; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/AccessTokenGrantValidator.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/AccessTokenGrantValidator.java similarity index 85% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/AccessTokenGrantValidator.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/AccessTokenGrantValidator.java index c3f323df4d..be7a0a6c33 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/AccessTokenGrantValidator.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/AccessTokenGrantValidator.java @@ -16,10 +16,10 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.validators; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators; +import io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler; import org.apache.oltu.oauth2.common.validators.AbstractValidator; -import org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler; import javax.servlet.http.HttpServletRequest; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/ExtendedJDBCScopeValidator.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/ExtendedJDBCScopeValidator.java similarity index 98% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/ExtendedJDBCScopeValidator.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/ExtendedJDBCScopeValidator.java index 48e224c087..1f8dc547ba 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/ExtendedJDBCScopeValidator.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/ExtendedJDBCScopeValidator.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.validators; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.mgt.oauth.extensions.internal.OAuthExtensionsDataHolder; +import io.entgra.device.mgt.core.device.mgt.oauth.extensions.internal.OAuthExtensionsDataHolder; import org.wso2.carbon.identity.application.common.model.User; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; import org.wso2.carbon.identity.oauth.cache.CacheEntry; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java similarity index 97% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java index 2d4010bf1c..9ca887beb7 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.validators; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.mgt.oauth.extensions.internal.OAuthExtensionsDataHolder; +import io.entgra.device.mgt.core.device.mgt.oauth.extensions.internal.OAuthExtensionsDataHolder; import org.wso2.carbon.identity.application.common.model.User; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception; diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/RoleBasedScopeValidator.java b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/RoleBasedScopeValidator.java similarity index 97% rename from components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/RoleBasedScopeValidator.java rename to components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/RoleBasedScopeValidator.java index 23e6d9d9a7..422739ea17 100644 --- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/RoleBasedScopeValidator.java +++ b/components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/src/main/java/io/entgra/device/mgt/core/device/mgt/oauth/extensions/validators/RoleBasedScopeValidator.java @@ -16,13 +16,13 @@ * under the License. */ -package org.wso2.carbon.device.mgt.oauth.extensions.validators; +package io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.device.mgt.oauth.extensions.internal.OAuthExtensionsDataHolder; +import io.entgra.device.mgt.core.device.mgt.oauth.extensions.internal.OAuthExtensionsDataHolder; import org.wso2.carbon.identity.application.common.model.User; import org.wso2.carbon.identity.base.IdentityConstants; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; diff --git a/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml index f532a8e3e8..468996abc4 100644 --- a/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml @@ -177,7 +177,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Device Management JWT Client Bundle io.entgra.device.mgt.core.identity.jwt.client.extension.internal diff --git a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml index b1e6b379a9..5757801392 100644 --- a/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml +++ b/components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml @@ -91,7 +91,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} OAuth Authenticator Bundle org.wso2.carbon.identity.authenticator.backend.oauth.internal diff --git a/components/identity-extensions/pom.xml b/components/identity-extensions/pom.xml index 8fcdb04c89..32a5b51dd5 100644 --- a/components/identity-extensions/pom.xml +++ b/components/identity-extensions/pom.xml @@ -33,7 +33,7 @@ http://wso2.org - + io.entgra.device.mgt.core.device.mgt.oauth.extensions io.entgra.device.mgt.core.identity.jwt.client.extension diff --git a/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml b/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml index e07f8adb9a..7011b3e319 100644 --- a/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml +++ b/components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml @@ -66,7 +66,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Device Notification Logger Bundle io.entgra.device.mgt.core.device.mgt.extensions.logger.*, diff --git a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml index ba1a9bcc96..bafde02b17 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml @@ -50,7 +50,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} IOT Operation Template Bundle io.entgra.device.mgt.core.operation.template.internal diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml index b6f6e1adee..46083a1667 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml @@ -29,7 +29,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Policy Decision Point Bundle io.entgra.device.mgt.core.policy.decision.point.internal diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml index d31c850da8..20b2c9298f 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml @@ -31,7 +31,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Policy Information Point Bundle io.entgra.device.mgt.core.policy.information.point.internal io.entgra.device.mgt.core.policy.information.point.internal.PolicyInformationPointBundleActivator diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml index 64cf57260f..6477371b8b 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml @@ -48,7 +48,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Policy Management Common Bundle javax.xml.bind.annotation, diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml index 002b7c4d83..c9760e3e98 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml @@ -48,7 +48,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Policy Management Core Bundle io.entgra.device.mgt.core.policy.mgt.core.internal diff --git a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml index f5536f1cd7..c138d56414 100644 --- a/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml @@ -49,7 +49,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Complex Policy Decision Point Bundle org.wso2.carbon.complex.policy.decision.point.internal diff --git a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml index 47dc0f05c5..8ab36a146e 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml @@ -49,7 +49,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Subtype Management Bundle io.entgra.device.mgt.core.subtype.mgt.internal diff --git a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml index 494f55f2d9..6991abad15 100755 --- a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml @@ -41,7 +41,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Task Management Common Bundle io.entgra.device.mgt.core.task.mgt.common.* diff --git a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml index 8dca004ab5..129b9b310b 100755 --- a/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml +++ b/components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml @@ -46,7 +46,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Task Management Core Bundle io.entgra.device.mgt.core.task.mgt.core.internal diff --git a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml index d7383bc2da..3046dbcbc9 100755 --- a/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml +++ b/components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml @@ -46,7 +46,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Task Watcher Bundle io.entgra.device.mgt.core.task.mgt.watcher.internal diff --git a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/pom.xml b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/pom.xml index ec1848fc1b..6b1aec0fc7 100644 --- a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/pom.xml +++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/pom.xml @@ -40,7 +40,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Tenant Management Common Bundle org.apache.commons.logging, diff --git a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml index 7d0e4ce05a..e8f306be23 100644 --- a/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml +++ b/components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml @@ -44,7 +44,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Tenant Management Core Bundle io.entgra.device.mgt.core.tenant.mgt.core.internal diff --git a/components/test-coverage/pom.xml b/components/test-coverage/pom.xml index 6ca55374d0..687d2826fb 100644 --- a/components/test-coverage/pom.xml +++ b/components/test-coverage/pom.xml @@ -100,7 +100,7 @@ identity-extensions - ${basedir}/../${identity.extensions}/org.wso2.carbon.device.mgt.oauth.extensions + ${basedir}/../${identity.extensions}/io.entgra.device.mgt.core.device.mgt.oauth.extensions ${basedir}/../${identity.extensions}/org.wso2.carbon.identity.authenticator.backend.oauth @@ -384,7 +384,7 @@ - + diff --git a/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml index a92e765fb2..6cdaa2fcee 100644 --- a/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml +++ b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml @@ -47,7 +47,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} Email Management Core Bundle io.entgra.device.mgt.core.transport.mgt.email.sender.core.internal diff --git a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml index 890c968ec0..422c6a00e5 100644 --- a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml @@ -43,7 +43,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} SMS Management Common Bundle io.entgra.device.mgt.core.transport.mgt.sms.handler.common.* diff --git a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml index 00fd79d676..d277b6289f 100644 --- a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml @@ -73,7 +73,7 @@ ${project.artifactId} ${project.artifactId} - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} SMS Management Core Bundle io.entgra.device.mgt.core.transport.mgt.sms.handler.core.internal diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml index 74e222e4f9..767a64e491 100644 --- a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml +++ b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml @@ -114,10 +114,10 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core:${io.entgra.device.mgt.core.version} com.googlecode.plist:dd-plist:${googlecode.plist.version} diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml index 6b74d3fd81..91223f189e 100644 --- a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension.feature/pom.xml @@ -86,7 +86,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.analytics.extension:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.analytics.extension:${io.entgra.device.mgt.core.version} diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml index 344a0b3344..a1f97282cb 100644 --- a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml @@ -115,7 +115,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${io.entgra.device.mgt.core.version} diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml index b2c343b2c0..6056225fb8 100644 --- a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml @@ -36,7 +36,7 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.keymgt.extension - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} @@ -114,7 +114,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension:${io.entgra.device.mgt.core.version} diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml index 859c2684ac..13402261d4 100644 --- a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml @@ -133,13 +133,13 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.webapp.publisher:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.webapp.publisher:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.annotations:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.annotations:${io.entgra.device.mgt.core.version} org.wso2.orbit.org.scannotation:scannotation:${scannotation.version} @@ -148,7 +148,7 @@ io.swagger:swagger-annotations:${swagger.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.extension.rest.api:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.extension.rest.api:${io.entgra.device.mgt.core.version} diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml index 5aeb4451fa..e60e41a11e 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml +++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml @@ -90,7 +90,7 @@ - io.entgra.device.mgt.core:org.wso2.carbon.apimgt.handlers:${carbon.device.mgt.version} + io.entgra.device.mgt.core:org.wso2.carbon.apimgt.handlers:${io.entgra.device.mgt.core.version} diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml index 37c63ea3e6..b5afacd766 100644 --- a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml @@ -147,10 +147,10 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.common:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.core:${io.entgra.device.mgt.core.version} com.googlecode.plist:dd-plist:${googlecode.plist.version} diff --git a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml index e0e882b639..391a9e379a 100644 --- a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml +++ b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml @@ -118,7 +118,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.certificate.mgt.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.certificate.mgt.core:${io.entgra.device.mgt.core.version} org.wso2.orbit.org.bouncycastle:bcpkix-jdk15on:${bcpkix.wso2.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml index a23fb2a220..d33f4f3724 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml @@ -94,7 +94,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml index 8fea541cbe..108eeb184b 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml @@ -89,12 +89,12 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer:${io.entgra.device.mgt.core.version} org.wso2.carbon.core.server:${carbon.kernel.version} - org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml index 50341cdf7f..a7755227c6 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml @@ -94,7 +94,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.logger:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.logger:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml index e4ae862603..b80dcba7a1 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml @@ -89,12 +89,12 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm:${io.entgra.device.mgt.core.version} org.wso2.carbon.core.server:${carbon.kernel.version} - org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml index 90f18cd5af..cc6a76f371 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml @@ -89,12 +89,12 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http:${io.entgra.device.mgt.core.version} org.wso2.carbon.core.server:${carbon.kernel.version} - org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml index 8b25a51d6d..8ccba63b5f 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml @@ -89,12 +89,12 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt:${io.entgra.device.mgt.core.version} org.wso2.carbon.core.server:${carbon.kernel.version} - org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml index 37aa7b3da2..61ae05d91d 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml @@ -89,12 +89,12 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp:${io.entgra.device.mgt.core.version} org.wso2.carbon.core.server:${carbon.kernel.version} - org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version} + org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml index 725dad7ca9..03139cbf87 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml @@ -95,7 +95,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.stateengine:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.stateengine:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml index f9516690ec..b0a27eafc6 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml @@ -94,10 +94,10 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.core:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.common:${io.entgra.device.mgt.core.version} @@ -110,7 +110,7 @@ org.wso2.carbon.core.server:${carbon.kernel.version} - org.wso2.carbon.email.sender:${carbon.device.mgt.version} + org.wso2.carbon.email.sender:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml index cc616e8a0f..9042c6ac7e 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml @@ -76,10 +76,10 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.common:${io.entgra.device.mgt.core.version} com.sun.jersey:jersey-core diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.feature/pom.xml index be27e37cf3..ee9b93241a 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.feature/pom.xml @@ -74,7 +74,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.server.feature:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.server.feature:${io.entgra.device.mgt.core.version} javax.servlet.jsp:javax.servlet.jsp-api diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml index 032efc396b..5fc2b0ec18 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml @@ -107,18 +107,18 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.basics.feature:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.basics.feature:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.api.feature:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.api.feature:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.url.printer:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.url.printer:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.pull.notification:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.pull.notification:${io.entgra.device.mgt.core.version} @@ -127,7 +127,7 @@ org.wso2.carbon.core.server:${carbon.kernel.version} - io.entgra.device.mgt.core.device.mgt.extensions:${carbon.device.mgt.version} + io.entgra.device.mgt.core.device.mgt.extensions:${io.entgra.device.mgt.core.version} diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml index f0cb452900..388ae4a1f5 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.analytics.feature/pom.xml @@ -125,7 +125,7 @@ - io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.analytics.data.publisher:${carbon.device.mgt.version} + io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.analytics.data.publisher:${io.entgra.device.mgt.core.version} diff --git a/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml index 8fb3c553d1..0bd010d5d2 100644 --- a/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml +++ b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml @@ -128,7 +128,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.server.bootup.heartbeat.beacon:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.server.bootup.heartbeat.beacon:${io.entgra.device.mgt.core.version} diff --git a/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml index 4e6249cba0..cd8ae0076e 100644 --- a/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml +++ b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml @@ -96,7 +96,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.identity.jwt.client.extension:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.identity.jwt.client.extension:${io.entgra.device.mgt.core.version} org.wso2.orbit.com.nimbusds:nimbus-jose-jwt:${nimbus.orbit.version} diff --git a/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml index 90ca4df5b5..962616027b 100644 --- a/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml +++ b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml @@ -104,7 +104,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.notification.logger:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.notification.logger:${io.entgra.device.mgt.core.version} diff --git a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml index 57016caa87..e932de7ba3 100644 --- a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml +++ b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.oauth.extensions.feature + io.entgra.device.mgt.core.device.mgt.oauth.extensions.feature pom WSO2 Carbon - Device Mgt OAuth Extensions Feature http://wso2.org @@ -41,7 +41,7 @@ io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.oauth.extensions + io.entgra.device.mgt.core.device.mgt.oauth.extensions io.entgra.device.mgt.core @@ -67,7 +67,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.oauth.extensions + io.entgra.device.mgt.core.device.mgt.oauth.extensions ../../../features/etc/feature.properties @@ -77,10 +77,10 @@ - io.entgra.device.mgt.core:org.wso2.carbon.device.mgt.oauth.extensions:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.oauth.extensions:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:org.wso2.carbon.identity.authenticator.backend.oauth:${carbon.device.mgt.version} + io.entgra.device.mgt.core:org.wso2.carbon.identity.authenticator.backend.oauth:${io.entgra.device.mgt.core.version} diff --git a/features/oauth-extensions/pom.xml b/features/oauth-extensions/pom.xml index 61163630aa..73b18607e7 100644 --- a/features/oauth-extensions/pom.xml +++ b/features/oauth-extensions/pom.xml @@ -27,14 +27,13 @@ 4.0.0 - io.entgra.device.mgt.core oauth-extensions-feature pom WSO2 Carbon - Device Management OAuth Extensions Feature http://wso2.org - org.wso2.carbon.device.mgt.oauth.extensions.feature + io.entgra.device.mgt.core.device.mgt.oauth.extensions.feature diff --git a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml index 580303d937..c28dd77f7a 100644 --- a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml +++ b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml @@ -95,7 +95,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.operation.template:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.operation.template:${io.entgra.device.mgt.core.version} diff --git a/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml b/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml index 0cc15a0484..f83dbe87ca 100644 --- a/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml @@ -107,16 +107,16 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.mgt.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.mgt.core:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.mgt.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.mgt.common:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.decision.point:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.decision.point:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.information.point:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.policy.information.point:${io.entgra.device.mgt.core.version} diff --git a/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml index 6bc7df365f..dbe8c0d4f1 100644 --- a/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml +++ b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml @@ -93,7 +93,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.subtype.mgt:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.subtype.mgt:${io.entgra.device.mgt.core.version} diff --git a/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml index 7b1dff689f..373a9fa675 100755 --- a/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml +++ b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml @@ -91,13 +91,13 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.core:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.common:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.watcher:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.task.mgt.watcher:${io.entgra.device.mgt.core.version} diff --git a/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml index 943bbd4774..d5768c90e9 100644 --- a/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml +++ b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml @@ -93,10 +93,10 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.tenant.mgt.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.tenant.mgt.core:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.tenant.mgt.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.tenant.mgt.common:${io.entgra.device.mgt.core.version} diff --git a/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml index 35d8a9c1d9..eea430f6d0 100644 --- a/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml +++ b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml @@ -95,7 +95,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.email.sender.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.email.sender.core:${io.entgra.device.mgt.core.version} org.wso2.orbit.org.apache.velocity:velocity:${velocity.version} diff --git a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml index 76e9eb5ca7..bb4c779663 100644 --- a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml @@ -94,10 +94,10 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.core:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.core:${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.common:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.transport.mgt.sms.handler.common:${io.entgra.device.mgt.core.version} diff --git a/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml index e1c9977822..2b00b777dd 100644 --- a/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml +++ b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml @@ -89,7 +89,7 @@ - io.entgra.device.mgt.core:io.entgra.device.mgt.core.webapp.authenticator.framework:${carbon.device.mgt.version} + io.entgra.device.mgt.core:io.entgra.device.mgt.core.webapp.authenticator.framework:${io.entgra.device.mgt.core.version} diff --git a/pom.xml b/pom.xml index b7630bd6d1..4b549f56a7 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.core - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core @@ -169,87 +169,87 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.url.printer - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.certificate.mgt.core - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.addons - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.core - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.common - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.publisher.api - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.store.api - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.mgt.common - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.mgt.core - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.decision.point - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.information.point - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.webapp.publisher - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.annotations - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.extension.rest.api - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.oauth.extensions - ${carbon.device.mgt.version} + io.entgra.device.mgt.core.device.mgt.oauth.extensions + ${io.entgra.device.mgt.core.version} org.wso2.carbon.identity @@ -260,95 +260,95 @@ io.entgra.device.mgt.core org.wso2.carbon.identity.authenticator.backend.oauth - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.transport.mgt.email.sender.core - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core org.wso2.carbon.device.mgt.analytics.data.publisher - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.server.feature zip - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.api.feature zip - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.application.extension - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.analytics.extension - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.identity.jwt.client.extension - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.application.extension.api - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.server.bootup.heartbeat.beacon - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.transport.mgt.sms.handler.core - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.transport.mgt.sms.handler.common - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.keymgt.extension.api - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.keymgt.extension - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.notification.logger - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} @@ -356,29 +356,29 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.tenant.mgt.common - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.tenant.mgt.core - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.task.mgt.common - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.task.mgt.core - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.task.mgt.watcher - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} @@ -386,7 +386,7 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.subtype.mgt - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} @@ -395,7 +395,7 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.operation.template - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} @@ -1644,47 +1644,47 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.logger - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.stateengine - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.pull.notification - ${carbon.device.mgt.version} + ${io.entgra.device.mgt.core.version} org.wso2.orbit.com.fasterxml.jackson.core @@ -2106,7 +2106,7 @@ 1.2.11.wso2v10 - 5.0.26-SNAPSHOT + 5.0.26-SNAPSHOT 4.7.35