From beef6b419d37d075d38ddf2e94f95da71e8c9c78 Mon Sep 17 00:00:00 2001 From: navodzoysa Date: Wed, 6 Nov 2024 15:12:13 +0530 Subject: [PATCH 1/2] Fix test case failure when extracting cert from signature --- .../mgt/core/impl/CertificateGenerator.java | 3 +-- .../util/CertificateManagementConstants.java | 1 + .../certificate/mgt/core/util/CommonUtil.java | 21 +++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGenerator.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGenerator.java index 6147618664..2d65fe4710 100755 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGenerator.java +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGenerator.java @@ -29,7 +29,6 @@ import io.entgra.device.mgt.core.certificate.mgt.core.util.CertificateManagement import io.entgra.device.mgt.core.certificate.mgt.core.util.CommonUtil; import io.entgra.device.mgt.core.certificate.mgt.core.util.Serializer; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.bouncycastle.asn1.ASN1Encodable; @@ -436,7 +435,7 @@ public class CertificateGenerator { String orgUnit = CommonUtil.getSubjectDnAttribute(reqCert, CertificateManagementConstants.ORG_UNIT_ATTRIBUTE); CertificateResponse lookUpCertificate; - if (StringUtils.isNotEmpty(orgUnit)) { + if (CommonUtil.isScepOrgUnit(orgUnit)) { int tenantId = Integer.parseInt(orgUnit.split(("_"))[1]); lookUpCertificate = keyStoreReader.getCertificateBySerial(reqCert.getSerialNumber().toString(), tenantId); diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagementConstants.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagementConstants.java index 35da404ef8..a423ccbd8e 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagementConstants.java +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CertificateManagementConstants.java @@ -36,6 +36,7 @@ public final class CertificateManagementConstants { public static final String CONF_LOCATION = "conf.location"; public static final String DEFAULT_PRINCIPAL = "O=WSO2, OU=Mobile, C=LK"; public static final String ORG_UNIT_ATTRIBUTE = "OU="; + public static final String ORG_UNIT_TENANT_PREFIX = "tenant_"; public static final String RSA_PRIVATE_KEY_BEGIN_TEXT = "-----BEGIN RSA PRIVATE KEY-----\n"; public static final String RSA_PRIVATE_KEY_END_TEXT = "-----END RSA PRIVATE KEY-----"; public static final String EMPTY_TEXT = ""; diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtil.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtil.java index a18dd057fa..b839917fb5 100755 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtil.java +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/util/CommonUtil.java @@ -18,6 +18,7 @@ package io.entgra.device.mgt.core.certificate.mgt.core.util; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import java.math.BigInteger; import java.security.cert.X509Certificate; @@ -68,4 +69,24 @@ public class CommonUtil { } return null; } + + /** + * Checks if the organizational unit (OU) attribute has a valid tenant id in order to verify that it is + * a SCEP certificate. eg: OU=tenant_1 + *

+ * Refer to engineering mail SCEP implementation for Android + * @param orgUnit organizational unit (OU) of the certificate + * @return true if it is a valid SCEP org unit else false + */ + public static boolean isScepOrgUnit(String orgUnit) { + if (StringUtils.isNotEmpty(orgUnit)) { + if (orgUnit.contains(CertificateManagementConstants.ORG_UNIT_TENANT_PREFIX)) { + String[] orgUnitArray = orgUnit.split(("_")); + if (orgUnitArray.length > 1) { + return NumberUtils.isNumber(orgUnitArray[1]); + } + } + } + return false; + } } -- 2.36.3 From d8fdf68322204c1882bc4cb31a61646be1c7d025 Mon Sep 17 00:00:00 2001 From: Rajitha Kumara Date: Tue, 12 Nov 2024 08:28:23 +0530 Subject: [PATCH 2/2] Fix feature installtion issues --- .../pom.xml | 1 + .../exception/GrafanaManagementException.java | 2 +- .../pom.xml | 2 +- .../pom.xml | 7 +++--- .../pom.xml | 23 ++++--------------- .../pom.xml | 23 +++++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 2 +- .../pom.xml | 11 ++++++--- .../pom.xml | 18 +++++++-------- .../pom.xml | 5 ++++ .../impl/DeviceManagementServiceImpl.java | 5 ---- .../pom.xml | 18 --------------- .../pom.xml | 3 ++- .../pom.xml | 4 ++++ .../pom.xml | 6 ++--- .../pom.xml | 6 ++--- .../pom.xml | 6 ++--- .../pom.xml | 6 ++--- .../pom.xml | 12 +++++----- 20 files changed, 73 insertions(+), 91 deletions(-) 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 cef83438fe..f94ddef9db 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 @@ -45,6 +45,7 @@ ${project.artifactId} ${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.common/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java index cdfdd8d4ad..b11af45f3a 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/src/main/java/io/entgra/device/mgt/core/analytics/mgt/grafana/proxy/common/exception/GrafanaManagementException.java @@ -17,7 +17,7 @@ */ package io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception; -public class GrafanaManagementException extends Exception{ +public class GrafanaManagementException extends Exception { private static final long serialVersionUID = -3922279312829079297L; 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 f17ed28470..4a1bc3ef5b 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 @@ -75,7 +75,7 @@ com.google.common.cache;version="[32.1,33)";resolution:=optional, com.google.gson;version="[2.9,3)", - + io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.bean, io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config, io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.xml.bean, 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 b55ec2abc2..36592ea462 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 @@ -38,6 +38,7 @@ org.wso2.carbon org.wso2.carbon.core + provided org.wso2.carbon @@ -71,14 +72,12 @@ ${io.entgra.device.mgt.core.version} API Management Application Bundle io.entgra.device.mgt.core.apimgt.application.extension.internal - - io.entgra.device.mgt.core.apimgt.analytics.extension.dto, - io.entgra.device.mgt.core.apimgt.analytics.extension.exception, + org.apache.velocity, org.apache.velocity.app, org.apache.velocity.context, org.wso2.carbon.utils;version="[4.8,5)" - + io.entgra.device.mgt.core.apimgt.analytics.extension.* 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 abbe4d60c7..96c986b93e 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 @@ -33,22 +33,6 @@ Entgra Device Management - API Management Custom Annotation Module https://entgra.io - - - org.apache.felix - org.apache.felix.scr.ds-annotations - provided - - - org.ops4j.pax.logging - pax-logging-api - provided - - - javax.ws.rs - jsr311-api - - @@ -61,12 +45,13 @@ ${project.artifactId} ${io.entgra.device.mgt.core.version} API Management Extentions - Custom Annotations + io.entgra.device.mgt.core.apimgt.annotations.* - - scribe;scope=compile|runtime;inline=false, - + + + 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 27cfdb1a78..3d15d728a5 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 @@ -42,23 +42,22 @@ org.wso2.carbon org.wso2.carbon.registry.core + provided org.wso2.carbon org.wso2.carbon.core + provided org.wso2.carbon org.wso2.carbon.utils - - - org.ops4j.pax.logging - pax-logging-api provided org.wso2.carbon.apimgt org.wso2.carbon.apimgt.api + provided org.wso2.carbon.apimgt @@ -68,10 +67,12 @@ com.googlecode.json-simple.wso2 json-simple + provided org.wso2.carbon.registry org.wso2.carbon.registry.indexing + provided io.entgra.device.mgt.core @@ -81,14 +82,18 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.extension.rest.api - + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common - + provided + + + commons-logging + commons-logging + provided - @@ -113,7 +118,7 @@ ${io.entgra.device.mgt.core.version} API Management Application Bundle io.entgra.device.mgt.core.apimgt.application.extension.internal - + io.entgra.device.mgt.core.apimgt.application.extension.bean, io.entgra.device.mgt.core.apimgt.application.extension.dto, io.entgra.device.mgt.core.apimgt.application.extension.exception, @@ -140,7 +145,7 @@ org.wso2.carbon.user.api;version="[1.0,2)", org.wso2.carbon.user.core.service;version="[4.8,5)", org.wso2.carbon.user.core.tenant;version="[4.8,5)" - + !io.entgra.device.mgt.core.apimgt.application.extension.internal, io.entgra.device.mgt.core.apimgt.application.extension.* 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 03aa7a3afb..a587d41ac1 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 @@ -75,7 +75,7 @@ ${io.entgra.device.mgt.core.version} API Management Application Bundle io.entgra.device.mgt.core.apimgt.keymgt.extension.internal - + com.google.gson;version="[2.9,3)", io.entgra.device.mgt.core.apimgt.keymgt.extension, io.entgra.device.mgt.core.apimgt.keymgt.extension.exception, @@ -111,7 +111,7 @@ org.wso2.carbon.user.core.service;version="[4.8,5)", org.wso2.carbon.user.core.tenant;version="[4.8,5)", org.wso2.carbon.utils.multitenancy;version="[4.8,5)" - + !io.entgra.device.mgt.core.apimgt.keymgt.extension.internal, io.entgra.device.mgt.core.apimgt.keymgt.extension.* 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 98aa220e17..391338fb55 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 @@ -166,7 +166,7 @@ com.google.gson;version="[2.9,3)", com.google.gson.reflect;version="[2.9,3)", - + io.entgra.device.mgt.core.apimgt.annotations;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.core.apimgt.extension.rest.api.*, io.entgra.device.mgt.core.apimgt.webapp.publisher.config, io.entgra.device.mgt.core.apimgt.webapp.publisher.dto, 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 1e761b259a..9ae8af088c 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 @@ -49,9 +49,9 @@ com.dd.plist;version="[1.21,2)", com.google.gson;version="[2.9,3)", com.google.gson.reflect;version="[2.9,3)", - - - + io.entgra.device.mgt.core.apimgt.application.extension;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.apimgt.application.extension.dto;version="${io.entgra.device.mgt.core.version.range}", + io.entgra.device.mgt.core.apimgt.application.extension.exception;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.core.application.mgt.common;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.core.application.mgt.common.config;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.core.application.mgt.common.dto;version="${io.entgra.device.mgt.core.version.range}", @@ -219,10 +219,12 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.common + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common + provided objenesis @@ -233,6 +235,7 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.core + provided org.wso2.securevault @@ -333,6 +336,7 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.application.extension + provided org.wso2.carbon.registry.servlet @@ -403,6 +407,7 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.identity.jwt.client.extension + provided diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper/pom.xml index f91058f41c..e8d9ef40d5 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper/pom.xml @@ -51,21 +51,21 @@ org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.service.*;version="${imp.package.version.osgi.service}", org.apache.commons.logging, - + org.apache.axis2.*;version="${axis2.osgi.version.range}", org.wso2.carbon.core, org.wso2.carbon.utils.*, - - - - - + javax.xml.bind;resolution:=optional, + javax.xml.bind.annotation, + javax.xml.parsers, + org.w3c.dom, + org.wso2.carbon, org.wso2.carbon.context, org.wso2.carbon.user.api, - + org.wso2.carbon.user.core.common, org.wso2.carbon.user.core.service, - + org.wso2.carbon.user.mgt.common, io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.service - + io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception !io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper.internal, diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml index 78f8e58ef0..a44e796c13 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml @@ -450,6 +450,11 @@ io.entgra.device.mgt.core.apimgt.analytics.extension provided + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.apimgt.application.extension + provided + io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.webapp.publisher diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java index afaab6c01d..3bad8a256e 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java @@ -19,17 +19,12 @@ package io.entgra.device.mgt.core.device.mgt.api.jaxrs.service.impl; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService; -import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderServiceImpl; import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplicationKey; import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException; -import io.entgra.device.mgt.core.apimgt.application.extension.internal.APIApplicationManagerExtensionDataHolder; import io.entgra.device.mgt.core.apimgt.extension.rest.api.APIApplicationServices; -import io.entgra.device.mgt.core.apimgt.extension.rest.api.APIApplicationServicesImpl; import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIApplicationKey; import io.entgra.device.mgt.core.apimgt.extension.rest.api.exceptions.APIServicesException; -import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse; import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest; import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse; import io.entgra.device.mgt.core.apimgt.keymgt.extension.exception.KeyMgtException; 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 9c8a346f0a..03906f7ac1 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 @@ -50,24 +50,6 @@ com.fasterxml.jackson.annotation;version="[2.9,3)", com.google.gson;version="[2.9,3)", - io.entgra.device.mgt.core.device.mgt.common, - io.entgra.device.mgt.core.device.mgt.common.app.mgt, - io.entgra.device.mgt.core.device.mgt.common.configuration.mgt, - io.entgra.device.mgt.core.device.mgt.common.device.details, - io.entgra.device.mgt.core.device.mgt.common.event.config, - io.entgra.device.mgt.core.device.mgt.common.exceptions, - io.entgra.device.mgt.core.device.mgt.common.general, - io.entgra.device.mgt.core.device.mgt.common.group.mgt, - io.entgra.device.mgt.core.device.mgt.common.invitation.mgt, - io.entgra.device.mgt.core.device.mgt.common.license.mgt, - io.entgra.device.mgt.core.device.mgt.common.metadata.mgt, - io.entgra.device.mgt.core.device.mgt.common.operation.mgt, - io.entgra.device.mgt.core.device.mgt.common.otp.mgt.dto, - io.entgra.device.mgt.core.device.mgt.common.policy.mgt, - io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor, - io.entgra.device.mgt.core.device.mgt.common.pull.notification, - io.entgra.device.mgt.core.device.mgt.common.push.notification, - io.entgra.device.mgt.core.device.mgt.common.type.mgt, io.swagger.annotations;version="[1.6,2)", javax.xml.bind.annotation;version="[0.0,1)" 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 4726cbb2ef..5aa3e0cece 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 @@ -78,7 +78,7 @@ com.google.common.reflect;version="[32.1,33)";resolution:=optional, com.google.gson;version="[2.9,3)", com.google.gson.reflect;version="[2.9,3)", - + io.entgra.device.mgt.core.apimgt.annotations;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.core.apimgt.extension.rest.api;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.core.apimgt.extension.rest.api.dto;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIInfo;version="${io.entgra.device.mgt.core.version.range}", @@ -365,6 +365,7 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.annotations + provided org.wso2.carbon.event-processing diff --git a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml index 14756b652d..4c7f5ba285 100644 --- a/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml +++ b/components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml @@ -333,5 +333,9 @@ org.json.wso2 json + + com.fasterxml.jackson.core + jackson-databind + \ No newline at end of file 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 64ba964fb8..2bda622bac 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 @@ -112,9 +112,9 @@ - - - + + 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:${io.entgra.device.mgt.core.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 98a010d956..528f494156 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 @@ -84,9 +84,9 @@ - - - + + 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 952f7bb9aa..0d0cf6d35d 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 @@ -113,9 +113,9 @@ - - - + + io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${io.entgra.device.mgt.core.version} + org.wso2.carbon.core.server:${carbon.kernel.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 64bda5f09a..4f70694ab7 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 @@ -112,9 +112,9 @@ - - - + + 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 1b316b263c..902aa5a801 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 @@ -130,12 +130,12 @@ 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:${io.entgra.device.mgt.core.version} + + + io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.annotations:${io.entgra.device.mgt.core.version} + io.entgra.org.scannotation:scannotation:${scannotation.version} -- 2.36.3