From ce2e57c6d0f78c753bd17feb4c373052e204c299 Mon Sep 17 00:00:00 2001 From: Rajitha Kumara Date: Tue, 7 May 2024 09:24:45 +0530 Subject: [PATCH 1/2] Fix tenant-mgt build failure --- .../pom.xml | 52 +++++++------------ 1 file changed, 18 insertions(+), 34 deletions(-) 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 2ffc7f68075..9b5b3387e3d 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 @@ -52,41 +52,25 @@ Tenant Management Core Bundle io.entgra.device.mgt.core.tenant.mgt.core.internal - io.entgra.device.mgt.core.application.mgt.common.exception;version="[5.0,6)", - io.entgra.device.mgt.core.application.mgt.common.services;version="[5.0,6)", - io.entgra.device.mgt.core.application.mgt.core.config;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.metadata.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.permission.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.roles.config;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.config;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.metadata.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.permission.mgt;version="[5.0,6)", - io.entgra.device.mgt.core.tenant.mgt.common.exception;version="[5.0,6)", - io.entgra.device.mgt.core.tenant.mgt.common.spi;version="[5.0,6)", - io.entgra.device.mgt.core.tenant.mgt.core, - org.apache.commons.logging;version="[1.2,2)", org.osgi.framework.*;version="${imp.package.version.osgi.framework}", - org.osgi.service.*;version="${imp.package.version.osgi.service}", - org.wso2.carbon.context;version="[4.8,5)", - org.wso2.carbon.registry.core.exceptions;version="[1.0,2)", - org.wso2.carbon.stratos.common.beans;version="[4.9,5)", - org.wso2.carbon.stratos.common.exception;version="[4.9,5)", - org.wso2.carbon.stratos.common.listeners;version="[4.9,5)", - org.wso2.carbon.user.api;version="[1.0,2)", - org.wso2.carbon.user.core.service;version="[4.8,5)", - org.apache.commons.logging, - io.entgra.device.mgt.core.application.mgt.common.*, - io.entgra.device.mgt.core.application.mgt.core.config, - io.entgra.device.mgt.core.device.mgt.core, - io.entgra.device.mgt.core.tenant.mgt.common.*, - io.entgra.device.mgt.core.device.mgt.common.metadata.mgt, - io.entgra.device.mgt.core.device.mgt.common.exceptions, - io.entgra.device.mgt.core.device.mgt.common.permission.mgt, - io.entgra.device.mgt.core.device.mgt.common.roles.config, - io.entgra.device.mgt.core.device.mgt.core.metadata.mgt, - io.entgra.device.mgt.core.device.mgt.core.config, - io.entgra.device.mgt.core.device.mgt.core.dao.* + org.osgi.service.component;version="${imp.package.version.osgi.service}", + io.entgra.device.mgt.core.application.mgt.common.exception.*;version="[5.0,6)", + io.entgra.device.mgt.core.application.mgt.common.services.*;version="[5.0,6)", + io.entgra.device.mgt.core.application.mgt.core.config.*;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.exceptions.*;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.permission.mgt.*;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.permission.mgt.*;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.roles.config.*;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.dao.*;version="[5.0,6)", + io.entgra.device.mgt.core.tenant.mgt.common.exception.*;version="[5.0,6)", + io.entgra.device.mgt.core.tenant.mgt.common.spi.*;version="[5.0,6)", + org.wso2.carbon.user.api.*, + org.wso2.carbon.user.core.service.*, + org.apache.commons.logging.*, + org.wso2.carbon.context.*, + org.wso2.carbon.stratos.common, + io.entgra.device.mgt.core.device.mgt.common.metadata.mgt.*;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.metadata.mgt.*;version="[5.0,6)" !io.entgra.device.mgt.core.tenant.mgt.core.internal, From faab9c863279e13eb1ce3765a1d74acfd0882e56 Mon Sep 17 00:00:00 2001 From: Rajitha Kumara Date: Tue, 7 May 2024 13:50:23 +0530 Subject: [PATCH 2/2] Update dependency list --- .../pom.xml | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) 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 80e7d66c436..94263258900 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 @@ -52,25 +52,30 @@ Tenant Management Core Bundle io.entgra.device.mgt.core.tenant.mgt.core.internal - org.osgi.framework.*;version="${imp.package.version.osgi.framework}", + io.entgra.device.mgt.core.application.mgt.common.exception;version="[5.0,6)", + io.entgra.device.mgt.core.application.mgt.common.services;version="[5.0,6)", + io.entgra.device.mgt.core.application.mgt.core.config;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.metadata.mgt;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.permission.mgt;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.common.roles.config;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.config;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.dao;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.metadata.mgt;version="[5.0,6)", + io.entgra.device.mgt.core.device.mgt.core.permission.mgt;version="[5.0,6)", + io.entgra.device.mgt.core.tenant.mgt.common.exception;version="[5.0,6)", + io.entgra.device.mgt.core.tenant.mgt.common.spi;version="[5.0,6)", + io.entgra.device.mgt.core.tenant.mgt.core, + org.apache.commons.logging;version="[1.2,2)", + org.osgi.framework;version="${imp.package.version.osgi.framework}", org.osgi.service.component;version="${imp.package.version.osgi.service}", - io.entgra.device.mgt.core.application.mgt.common.exception.*;version="[5.0,6)", - io.entgra.device.mgt.core.application.mgt.common.services.*;version="[5.0,6)", - io.entgra.device.mgt.core.application.mgt.core.config.*;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.exceptions.*;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.permission.mgt.*;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.permission.mgt.*;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.common.roles.config.*;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.dao.*;version="[5.0,6)", - io.entgra.device.mgt.core.tenant.mgt.common.exception.*;version="[5.0,6)", - io.entgra.device.mgt.core.tenant.mgt.common.spi.*;version="[5.0,6)", - org.wso2.carbon.user.api.*, - org.wso2.carbon.user.core.service.*, - org.apache.commons.logging.*, - org.wso2.carbon.context.*, - org.wso2.carbon.stratos.common, - io.entgra.device.mgt.core.device.mgt.common.metadata.mgt.*;version="[5.0,6)", - io.entgra.device.mgt.core.device.mgt.core.metadata.mgt.*;version="[5.0,6)" + org.wso2.carbon.context;version="[4.8,5)", + org.wso2.carbon.registry.core.exceptions;version="[1.0,2)", + org.wso2.carbon.stratos.common.beans;version="[4.9,5)", + org.wso2.carbon.stratos.common.exception;version="[4.9,5)", + org.wso2.carbon.stratos.common.listeners;version="[4.9,5)", + org.wso2.carbon.user.api;version="[1.0,2)", + org.wso2.carbon.user.core.service;version="[4.8,5)" !io.entgra.device.mgt.core.tenant.mgt.core.internal,