diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml index 926b32cdd..53c15ecd7 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml @@ -17,7 +17,8 @@ ~ under the License. --> - + io.entgra.device.mgt.plugins emqx-extensions @@ -30,7 +31,6 @@ jar Entgra Device Management Plugins - EMQX Extension Hook - io.grpc @@ -69,6 +69,11 @@ commons-lang provided + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.common + provided + io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.core diff --git a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml index dd30916d4..53cfd7566 100644 --- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml +++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml @@ -42,62 +42,127 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.core + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common + provided org.wso2.siddhi siddhi-core + provided org.wso2.siddhi siddhi-query-api + provided log4j log4j + provided org.json.wso2 json + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.identity.jwt.client.extension + provided io.github.openfeign feign-core + provided io.github.openfeign feign-jaxrs + provided io.github.openfeign feign-gson + provided io.github.openfeign feign-slf4j + provided com.squareup.okhttp3 okhttp + provided com.squareup.okio okio + provided io.github.openfeign feign-okhttp + provided javax.ws.rs jsr311-api + provided + + + org.wso2.orbit.javax.xml.bind + jaxb-api + provided + + + org.wso2.carbon + org.wso2.carbon.utils + provided + + + org.wso2.carbon + org.wso2.carbon.user.api + provided + + + org.wso2.carbon + org.wso2.carbon.user.core + test + + + org.wso2.carbon + org.wso2.carbon.registry.core + test + + + org.apache.httpcomponents.wso2 + httpcore + test + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.extensions.logger + test + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.notification.logger + test + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core + test + + + org.apache.axis2.wso2 + axis2 + test org.wso2.orbit.com.h2database diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml index 691588997..1f53ad6e6 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml @@ -16,7 +16,8 @@ ~ under the License. --> - + android-plugin @@ -49,7 +50,9 @@ org.jacoco jacoco-maven-plugin - ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec + + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec + @@ -65,8 +68,12 @@ report - ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec - ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/site + + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec + + + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/site + @@ -110,9 +117,10 @@ - + - + @@ -124,7 +132,9 @@ org.jacoco jacoco-maven-plugin - ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec + + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec + @@ -140,8 +150,12 @@ report - ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec - ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/site + + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/jacoco-unit.exec + + + ../io.entgra.device.mgt.plugins.mobile.android.api/target/coverage-reports/site + @@ -181,6 +195,7 @@ org.json.wso2 json + provided @@ -256,6 +271,7 @@ com.google.code.gson gson + provided io.swagger @@ -348,5 +364,10 @@ org.codehaus.jackson jackson-core-asl + + com.fasterxml.jackson.core + jackson-annotations + provided + diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml index d0f30f0e8..4cc8f666e 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml @@ -18,7 +18,8 @@ ~ under the License. --> - + android-plugin io.entgra.device.mgt.plugins @@ -139,46 +140,57 @@ org.wso2.carbon org.wso2.carbon.core + provided org.ops4j.pax.logging pax-logging-api + provided org.wso2.carbon org.wso2.carbon.utils + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions + provided org.wso2.carbon org.wso2.carbon.ndatasource.core + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.mgt.common + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.mgt.core + provided org.wso2.carbon org.wso2.carbon.registry.api + provided org.wso2.carbon org.wso2.carbon.registry.core + provided org.testng testng + test org.wso2.orbit.org.apache.tomcat @@ -192,6 +204,12 @@ com.google.code.gson gson + provided + + + org.wso2.orbit.javax.xml.bind + jaxb-api + provided diff --git a/pom.xml b/pom.xml index 320b80240..b3af08f97 100644 --- a/pom.xml +++ b/pom.xml @@ -316,6 +316,21 @@ io.entgra.device.mgt.core.apimgt.annotations ${io.entgra.device.mgt.core.version} + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.device.mgt.extensions.logger + ${io.entgra.device.mgt.core.version} + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.notification.logger + ${io.entgra.device.mgt.core.version} + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core + ${io.entgra.device.mgt.core.version} + org.wso2.carbon.commons @@ -664,6 +679,11 @@ jsr311-api ${javax.ws.rs.version} + + org.wso2.orbit.javax.xml.bind + jaxb-api + ${javax.xml.bind.version} + commons-httpclient.wso2 @@ -690,6 +710,11 @@ jackson-jaxrs ${jackson.version} + + com.fasterxml.jackson.core + jackson-annotations + ${fasterxml.jackson.version} + commons-io.wso2 commons-io @@ -996,7 +1021,9 @@ 2.5.11 2.6.1.wso2v2 1.9.13 + 2.4.5 1.1.1 + 2.3.1.wso2v1 4.9.2