Fix bundle imports

pull/84/head
Charitha Goonetilleke 2 months ago
parent ab3e104ac8
commit 1fa93231f8

@ -143,7 +143,7 @@
feign.codec;version="[11.0,12)", feign.codec;version="[11.0,12)",
feign.gson;version="[11.0,12)", feign.gson;version="[11.0,12)",
feign.slf4j;version="[11.0,12)", feign.slf4j;version="[11.0,12)",
io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
io.entgra.device.mgt.plugins.input.adapter.http.oauth.exception, io.entgra.device.mgt.plugins.input.adapter.http.oauth.exception,
io.entgra.device.mgt.plugins.input.adapter.http.util, io.entgra.device.mgt.plugins.input.adapter.http.util,
javax.net.ssl, javax.net.ssl,

@ -127,12 +127,12 @@
io.entgra.device.mgt.plugins.input.adapter.mqtt.* io.entgra.device.mgt.plugins.input.adapter.mqtt.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)", io.entgra.device.mgt.core.apimgt.keymgt.extension;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)", io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)", io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
io.entgra.device.mgt.plugins.input.adapter.mqtt, io.entgra.device.mgt.plugins.input.adapter.mqtt,
io.entgra.device.mgt.plugins.input.adapter.mqtt.util, io.entgra.device.mgt.plugins.input.adapter.mqtt.util,
javax.net.ssl, javax.net.ssl,

@ -103,7 +103,7 @@
<Bundle-Name>${project.artifactId}</Bundle-Name> <Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package> <Private-Package>
io.entgra.device.mgt.plugins.input.adapter.xmpp.internal, io.entgra.device.mgt.plugins.input.adapter.xmpp.internal,
io.entgra.device.mgt.plugins.input.adapter.http.internal.* io.entgra.device.mgt.plugins.input.adapter.xmpp.internal.*
</Private-Package> </Private-Package>
<Export-Package> <Export-Package>
!io.entgra.device.mgt.plugins.input.adapter.xmpp.internal, !io.entgra.device.mgt.plugins.input.adapter.xmpp.internal,
@ -111,8 +111,7 @@
io.entgra.device.mgt.plugins.input.adapter.xmpp.* io.entgra.device.mgt.plugins.input.adapter.xmpp.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
io.entgra.device.mgt.plugins.input.adapter.xmpp,
org.apache.commons.logging;version="[1.2,2)", org.apache.commons.logging;version="[1.2,2)",
org.jivesoftware.smack, org.jivesoftware.smack,
org.jivesoftware.smack.filter, org.jivesoftware.smack.filter,

@ -103,10 +103,10 @@
io.entgra.device.mgt.plugins.output.adapter.http.* io.entgra.device.mgt.plugins.output.adapter.http.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.plugins.output.adapter.http.util, io.entgra.device.mgt.plugins.output.adapter.http.util,
javax.net.ssl, javax.net.ssl,
org.apache.commons.httpclient;version="[3.1,4)", org.apache.commons.httpclient;version="[3.1,4)",

@ -116,11 +116,11 @@
io.entgra.device.mgt.plugins.output.adapter.mqtt.*, io.entgra.device.mgt.plugins.output.adapter.mqtt.*,
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)", io.entgra.device.mgt.core.apimgt.keymgt.extension;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)", io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)", io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.plugins.output.adapter.mqtt, io.entgra.device.mgt.plugins.output.adapter.mqtt,
io.entgra.device.mgt.plugins.output.adapter.mqtt.util, io.entgra.device.mgt.plugins.output.adapter.mqtt.util,
javax.net.ssl, javax.net.ssl,

@ -88,14 +88,14 @@
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
com.google.gson;version="[2.9,3)", com.google.gson;version="[2.9,3)",
io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.exceptions;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.core.config;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.core.config;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.core.config.pull.notification;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.core.config.pull.notification;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.core.service;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)", io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
org.apache.commons.logging;version="[1.2,2)", org.apache.commons.logging;version="[1.2,2)",
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",

@ -17,7 +17,8 @@
~ under the License. ~ under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>io.entgra.device.mgt.plugins</groupId> <groupId>io.entgra.device.mgt.plugins</groupId>
@ -29,7 +30,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device</artifactId> <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device</artifactId>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Entgra Device Management Plugins - Siddhi Extensions - Device management Core functionality as Siddhi extension</name> <name>Entgra Device Management Plugins - Siddhi Extensions - Device management Core</name>
<url>http://entgra.io</url> <url>http://entgra.io</url>
<dependencies> <dependencies>
@ -168,26 +169,21 @@
io.entgra.device.mgt.plugins.extension.siddhi.device.* io.entgra.device.mgt.plugins.extension.siddhi.device.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
<!-- android.net.http,-->
<!-- android.net.ssl,-->
<!-- android.os,-->
<!-- android.security,-->
<!-- android.util,-->
feign;version="[11.0,12)", feign;version="[11.0,12)",
feign.auth;version="[11.0,12)", feign.auth;version="[11.0,12)",
feign.codec;version="[11.0,12)", feign.codec;version="[11.0,12)",
feign.gson;version="[11.0,12)", feign.gson;version="[11.0,12)",
feign.slf4j;version="[11.0,12)", feign.slf4j;version="[11.0,12)",
io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.exceptions;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.group.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.group.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.notification.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.notification.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.core.service;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)", io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs, io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs,
io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto, io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto,
io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception, io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception,
@ -198,29 +194,9 @@
javax.security.auth.x500,javax.xml.bind;version="[0.0,1)", javax.security.auth.x500,javax.xml.bind;version="[0.0,1)",
javax.xml.bind.annotation;version="[0.0,1)", javax.xml.bind.annotation;version="[0.0,1)",
javax.xml.parsers, javax.xml.parsers,
<!-- kotlin;resolution:=optional,-->
<!-- kotlin.*;resolution:=optional,-->
<!-- kotlin,-->
<!-- kotlin.annotation,-->
<!-- kotlin.collections,-->
<!-- kotlin.comparisons,-->
<!-- kotlin.io,-->
<!-- kotlin.jvm,-->
<!-- kotlin.jvm.functions,-->
<!-- kotlin.jvm.internal,-->
<!-- kotlin.jvm.internal.markers,-->
<!-- kotlin.ranges,-->
<!-- kotlin.reflect,-->
<!-- kotlin.sequences,-->
<!-- kotlin.text,-->
org.apache.commons.lang;version="[2.6,3)", org.apache.commons.lang;version="[2.6,3)",
org.apache.commons.logging;version="[1.2,2)", org.apache.commons.logging;version="[1.2,2)",
<!-- org.bouncycastle.jsse;version="[1.70,2)",-->
<!-- org.bouncycastle.jsse.provider;version="[1.70,2)",-->
<!-- org.conscrypt,-->
org.json;version="[3.0,4)", org.json;version="[3.0,4)",
<!-- org.openjsse.javax.net.ssl,-->
<!-- org.openjsse.net.ssl,-->
org.w3c.dom, org.w3c.dom,
org.wso2.carbon.base;version="[1.0,2)", org.wso2.carbon.base;version="[1.0,2)",
org.wso2.carbon.context;version="[4.8,5)", org.wso2.carbon.context;version="[4.8,5)",

@ -56,21 +56,21 @@
<Private-Package>io.entgra.device.mgt.plugins.mobile.android.internal</Private-Package> <Private-Package>io.entgra.device.mgt.plugins.mobile.android.internal</Private-Package>
<Import-Package> <Import-Package>
com.google.gson;version="[2.9,3)", com.google.gson;version="[2.9,3)",
io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.app.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.app.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.configuration.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.configuration.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.exceptions;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.general;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.general;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.invitation.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.invitation.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.license.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.license.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.policy.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.policy.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.push.notification;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.push.notification;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.spi;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.spi;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.common.type.mgt;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.type.mgt;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry;version="${io.entgra.device.mgt.core.version.range}",
io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource, io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource,
io.entgra.device.mgt.plugins.mobile.android.impl.dao, io.entgra.device.mgt.plugins.mobile.android.impl.dao,
io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl, io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl,

@ -970,6 +970,7 @@
<!-- Carbon Device Management Plugins --> <!-- Carbon Device Management Plugins -->
<io.entgra.device.mgt.plugins.version>7.0.0-SNAPSHOT</io.entgra.device.mgt.plugins.version> <io.entgra.device.mgt.plugins.version>7.0.0-SNAPSHOT</io.entgra.device.mgt.plugins.version>
<io.entgra.device.mgt.plugins.version.range>[7.0.0, 8.0.0)</io.entgra.device.mgt.plugins.version.range>
<!-- Android Agent Artifact Version--> <!-- Android Agent Artifact Version-->
<android.agent.version>4.0.0</android.agent.version> <android.agent.version>4.0.0</android.agent.version>

Loading…
Cancel
Save