mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Fix feature installation issues
This commit is contained in:
Lasantha Dharmakeerthi
commit
5aa13f5484
@ -45,6 +45,7 @@
|
||||
<Bundle-Name>${project.artifactId}</Bundle-Name>
|
||||
<Bundle-Version>${io.entgra.device.mgt.core.version}</Bundle-Version>
|
||||
<Bundle-Description>Grafana Management Common Bundle</Bundle-Description>
|
||||
<Import-Package></Import-Package>
|
||||
<Export-Package>
|
||||
io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.*
|
||||
</Export-Package>
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
<Import-Package>
|
||||
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.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,
|
||||
|
||||
@ -38,6 +38,7 @@
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon</groupId>
|
||||
<artifactId>org.wso2.carbon.core</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon</groupId>
|
||||
@ -71,14 +72,12 @@
|
||||
<Bundle-Version>${io.entgra.device.mgt.core.version}</Bundle-Version>
|
||||
<Bundle-Description>API Management Application Bundle</Bundle-Description>
|
||||
<Private-Package>io.entgra.device.mgt.core.apimgt.application.extension.internal</Private-Package>
|
||||
<Import-Packages>
|
||||
io.entgra.device.mgt.core.apimgt.analytics.extension.dto,
|
||||
io.entgra.device.mgt.core.apimgt.analytics.extension.exception,
|
||||
<Import-Package>
|
||||
org.apache.velocity,
|
||||
org.apache.velocity.app,
|
||||
org.apache.velocity.context,
|
||||
org.wso2.carbon.utils;version="[4.8,5)"
|
||||
</Import-Packages>
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
io.entgra.device.mgt.core.apimgt.analytics.extension.*
|
||||
</Export-Package>
|
||||
|
||||
@ -33,22 +33,6 @@
|
||||
<description>Entgra Device Management - API Management Custom Annotation Module</description>
|
||||
<url>https://entgra.io</url>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.logging</groupId>
|
||||
<artifactId>pax-logging-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>jsr311-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
@ -61,12 +45,13 @@
|
||||
<Bundle-Name>${project.artifactId}</Bundle-Name>
|
||||
<Bundle-Version>${io.entgra.device.mgt.core.version}</Bundle-Version>
|
||||
<Bundle-Description>API Management Extentions - Custom Annotations</Bundle-Description>
|
||||
<Import-Package></Import-Package>
|
||||
<Export-Package>
|
||||
io.entgra.device.mgt.core.apimgt.annotations.*
|
||||
</Export-Package>
|
||||
<Embed-Dependency>
|
||||
scribe;scope=compile|runtime;inline=false,
|
||||
</Embed-Dependency>
|
||||
<!-- <Embed-Dependency>-->
|
||||
<!-- scribe;scope=compile|runtime;inline=false,-->
|
||||
<!-- </Embed-Dependency>-->
|
||||
</instructions>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
@ -42,23 +42,22 @@
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon</groupId>
|
||||
<artifactId>org.wso2.carbon.registry.core</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon</groupId>
|
||||
<artifactId>org.wso2.carbon.core</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon</groupId>
|
||||
<artifactId>org.wso2.carbon.utils</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.logging</groupId>
|
||||
<artifactId>pax-logging-api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon.apimgt</groupId>
|
||||
<artifactId>org.wso2.carbon.apimgt.api</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon.apimgt</groupId>
|
||||
@ -68,10 +67,12 @@
|
||||
<dependency>
|
||||
<groupId>com.googlecode.json-simple.wso2</groupId>
|
||||
<artifactId>json-simple</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon.registry</groupId>
|
||||
<artifactId>org.wso2.carbon.registry.indexing</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
@ -81,14 +82,18 @@
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.apimgt.extension.rest.api</artifactId>
|
||||
<!-- <scope>provided</scope>-->
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
|
||||
<!-- <scope>provided</scope>-->
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@ -113,7 +118,7 @@
|
||||
<Bundle-Version>${io.entgra.device.mgt.core.version}</Bundle-Version>
|
||||
<Bundle-Description>API Management Application Bundle</Bundle-Description>
|
||||
<Private-Package>io.entgra.device.mgt.core.apimgt.application.extension.internal</Private-Package>
|
||||
<Import-Packages>
|
||||
<Import-Package>
|
||||
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)"
|
||||
</Import-Packages>
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
!io.entgra.device.mgt.core.apimgt.application.extension.internal,
|
||||
io.entgra.device.mgt.core.apimgt.application.extension.*
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
<Bundle-Version>${io.entgra.device.mgt.core.version}</Bundle-Version>
|
||||
<Bundle-Description>API Management Application Bundle</Bundle-Description>
|
||||
<Private-Package>io.entgra.device.mgt.core.apimgt.keymgt.extension.internal</Private-Package>
|
||||
<Import-Packages>
|
||||
<Import-Package>
|
||||
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)"
|
||||
</Import-Packages>
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
!io.entgra.device.mgt.core.apimgt.keymgt.extension.internal,
|
||||
io.entgra.device.mgt.core.apimgt.keymgt.extension.*
|
||||
|
||||
@ -166,7 +166,7 @@
|
||||
<Import-Package>
|
||||
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.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,
|
||||
|
||||
@ -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.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 @@
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.application.mgt.common</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>objenesis</artifactId>
|
||||
@ -233,6 +235,7 @@
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>org.wso2.securevault</artifactId>
|
||||
@ -333,6 +336,7 @@
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>org.wso2.carbon.registry.servlet</artifactId>
|
||||
@ -403,6 +407,7 @@
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!--nTask dependencies-->
|
||||
<dependency>
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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 = "";
|
||||
|
||||
@ -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
|
||||
* <br/><br/>
|
||||
* 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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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.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,-->
|
||||
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.common,
|
||||
org.wso2.carbon.user.core.service,
|
||||
<!-- org.wso2.carbon.user.mgt.common,-->
|
||||
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.server.bootup.heartbeat.beacon.exception
|
||||
</Import-Package>
|
||||
<Export-Package>
|
||||
!io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper.internal,
|
||||
|
||||
@ -450,6 +450,11 @@
|
||||
<artifactId>io.entgra.device.mgt.core.apimgt.analytics.extension</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.apimgt.webapp.publisher</artifactId>
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -50,24 +50,6 @@
|
||||
<Import-Package>
|
||||
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)"
|
||||
</Import-Package>
|
||||
|
||||
@ -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.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 @@
|
||||
<dependency>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.wso2.carbon.event-processing</groupId>
|
||||
|
||||
@ -333,5 +333,9 @@
|
||||
<groupId>org.json.wso2</groupId>
|
||||
<artifactId>json</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@ -112,9 +112,9 @@
|
||||
</properties>
|
||||
</adviceFile>
|
||||
<bundles>
|
||||
<!-- <bundleDef>-->
|
||||
<!-- io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common:${io.entgra.device.mgt.core.version}-->
|
||||
<!-- </bundleDef>-->
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common:${io.entgra.device.mgt.core.version}
|
||||
</bundleDef>
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core:${io.entgra.device.mgt.core.version}
|
||||
</bundleDef>
|
||||
|
||||
@ -84,9 +84,9 @@
|
||||
</properties>
|
||||
</adviceFile>
|
||||
<bundles>
|
||||
<!-- <bundleDef>-->
|
||||
<!-- io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.analytics.extension:${io.entgra.device.mgt.core.version}-->
|
||||
<!-- </bundleDef>-->
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.analytics.extension:${io.entgra.device.mgt.core.version}
|
||||
</bundleDef>
|
||||
</bundles>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
||||
@ -113,9 +113,9 @@
|
||||
</properties>
|
||||
</adviceFile>
|
||||
<bundles>
|
||||
<!-- <bundleDef>-->
|
||||
<!-- io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${io.entgra.device.mgt.core.version}-->
|
||||
<!-- </bundleDef>-->
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${io.entgra.device.mgt.core.version}
|
||||
</bundleDef>
|
||||
</bundles>
|
||||
<importFeatures>
|
||||
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
|
||||
|
||||
@ -112,9 +112,9 @@
|
||||
</properties>
|
||||
</adviceFile>
|
||||
<bundles>
|
||||
<!-- <bundleDef>-->
|
||||
<!-- io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension:${io.entgra.device.mgt.core.version}-->
|
||||
<!-- </bundleDef>-->
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.keymgt.extension:${io.entgra.device.mgt.core.version}
|
||||
</bundleDef>
|
||||
</bundles>
|
||||
<importBundles>
|
||||
</importBundles>
|
||||
|
||||
@ -130,12 +130,12 @@
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.webapp.publisher:${io.entgra.device.mgt.core.version}
|
||||
</bundleDef>
|
||||
<!-- <bundleDef>-->
|
||||
<!-- io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${io.entgra.device.mgt.core.version}-->
|
||||
<!-- </bundleDef>-->
|
||||
<!-- <bundleDef>-->
|
||||
<!-- io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.annotations:${io.entgra.device.mgt.core.version}-->
|
||||
<!-- </bundleDef>-->
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${io.entgra.device.mgt.core.version}
|
||||
</bundleDef>
|
||||
<bundleDef>
|
||||
io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.annotations:${io.entgra.device.mgt.core.version}
|
||||
</bundleDef>
|
||||
<bundleDef>
|
||||
io.entgra.org.scannotation:scannotation:${scannotation.version}
|
||||
</bundleDef>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user