diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml index fc7ad23766..94ebc7c237 100644 --- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml +++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml @@ -103,8 +103,8 @@ provided - commons-httpclient.wso2 - commons-httpclient + org.wso2.orbit.org.apache.httpcomponents + httpclient provided 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 db015d3895..8885a1b3ee 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 @@ -146,6 +146,7 @@ io.entgra.org.scannotation scannotation + provided io.entgra.device.mgt.core @@ -160,6 +161,7 @@ org.wso2.carbon org.wso2.carbon.utils + provided org.ops4j.pax.logging @@ -174,10 +176,12 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.core + provided com.google.guava @@ -188,15 +192,17 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.core + provided org.apache.httpcomponents.wso2 httpclient - compile + provided org.apache.httpcomponents.client5 httpclient5 + provided io.entgra.device.mgt.core @@ -212,22 +218,27 @@ javax.ws.rs javax.ws.rs-api + provided javax.ws.rs jsr311-api + provided org.javassist javassist + provided org.powermock powermock-api-mockito2 + test org.wso2.carbon org.wso2.carbon.ndatasource.core + provided commons-lang @@ -248,6 +259,7 @@ org.testng testng + test org.powermock @@ -257,70 +269,86 @@ org.wso2.carbon org.wso2.carbon.user.core + provided org.wso2.carbon org.wso2.carbon.user.api + provided org.wso2.carbon org.wso2.carbon.registry.api + provided org.wso2.carbon org.wso2.carbon.registry.core + provided org.wso2.orbit.org.apache.tomcat jdbc-pool + provided org.wso2.carbon org.wso2.carbon.base + provided org.wso2.carbon.governance org.wso2.carbon.governance.api + provided org.apache.axis2.transport axis2-transport-mail + provided org.apache.ws.commons.axiom.wso2 axiom + provided org.apache.axis2.wso2 axis2 + provided org.wso2.carbon.identity.inbound.auth.oauth2 org.wso2.carbon.identity.oauth.stub + provided org.wso2.orbit.org.apache.tomcat tomcat + provided org.wso2.orbit.org.apache.tomcat tomcat-servlet-api + provided org.wso2.carbon.commons org.wso2.carbon.ntask.core + provided commons-collections.wso2 commons-collections + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.transport.mgt.email.sender.core + provided mysql @@ -330,6 +358,7 @@ com.google.code.gson gson + provided io.swagger @@ -339,22 +368,27 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.annotations + provided org.wso2.carbon.event-processing org.wso2.carbon.event.processor.stub + provided org.wso2.carbon.multitenancy org.wso2.carbon.tenant.mgt + provided commons-validator commons-validator + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.server.bootup.heartbeat.beacon + provided com.google.guava @@ -366,5 +400,10 @@ jaxb-api provided + + org.wso2.orbit.org.apache.httpcomponents + httpclient + provided + diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml index 826c889929..4a16aa3c33 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml @@ -52,8 +52,8 @@ jackson-jaxrs - commons-httpclient.wso2 - commons-httpclient + org.wso2.orbit.org.apache.httpcomponents + httpclient provided @@ -116,8 +116,8 @@ ant - commons-httpclient.wso2 - commons-httpclient + org.wso2.orbit.org.apache.httpcomponents + httpclient org.eclipse.equinox @@ -159,6 +159,11 @@ org.wso2.carbon.registry.core provided + + org.wso2.orbit.javax.xml.bind + jaxb-api + provided + diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml index 016f981d93..e5a22b33f7 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml @@ -40,8 +40,8 @@ provided - commons-httpclient.wso2 - commons-httpclient + org.wso2.orbit.org.apache.httpcomponents + httpclient provided diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml index 6fc308d4b6..83d5c3e0a1 100644 --- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml +++ b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml @@ -94,10 +94,12 @@ commons-codec.wso2 commons-codec + provided commons-io.wso2 commons-io + provided io.swagger @@ -107,22 +109,27 @@ org.json.wso2 json + provided com.google.code.gson gson + provided 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.hibernate hibernate-validator + provided org.apache.cxf @@ -132,6 +139,12 @@ org.codehaus.jackson jackson-core-asl + provided + + + org.wso2.orbit.com.fasterxml.jackson.core + jackson-annotations + provided 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 5f663268d1..f7299a62ef 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 @@ -443,6 +443,21 @@ jaxb-api provided + + org.wso2.orbit.org.apache.httpcomponents + httpclient + provided + + + org.wso2.orbit.org.apache.tomcat + tomcat-servlet-api + provided + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core + test + diff --git a/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.admin.api/pom.xml b/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.admin.api/pom.xml index 0b28d6dfa5..ecc10b551e 100644 --- a/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.admin.api/pom.xml +++ b/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.admin.api/pom.xml @@ -124,6 +124,7 @@ commons-codec.wso2 commons-codec + provided commons-codec @@ -188,6 +189,11 @@ org.wso2.carbon.utils provided + + org.wso2.orbit.com.fasterxml.jackson.core + jackson-annotations + provided + \ No newline at end of file diff --git a/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.common/pom.xml b/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.common/pom.xml index b560d70134..1d47b32303 100644 --- a/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.common/pom.xml +++ b/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.common/pom.xml @@ -96,10 +96,21 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common + provided io.swagger swagger-annotations + + org.wso2.orbit.javax.xml.bind + jaxb-api + provided + + + org.wso2.orbit.com.fasterxml.jackson.core + jackson-annotations + provided + \ No newline at end of file diff --git a/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.core/pom.xml b/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.core/pom.xml index 7055d7952a..7c3d51a4b7 100644 --- a/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.core/pom.xml +++ b/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.core/pom.xml @@ -85,30 +85,42 @@ org.wso2.carbon org.wso2.carbon.utils + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.cea.mgt.common + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.cea.mgt.enforce + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common + provided org.wso2.carbon org.wso2.carbon.ndatasource.core + provided org.wso2.carbon.commons org.wso2.carbon.ntask.core + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.core + provided + + + org.wso2.orbit.javax.xml.bind + jaxb-api + provided \ No newline at end of file diff --git a/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.enforce/pom.xml b/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.enforce/pom.xml index 5f8eae52c7..042340fbae 100644 --- a/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.enforce/pom.xml +++ b/components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.enforce/pom.xml @@ -18,7 +18,8 @@ --> - + io.entgra.device.mgt.core cea-mgt @@ -107,37 +108,48 @@ org.apache.felix.scr.ds-annotations provided - - - - - - - - + + + + + + + + com.google.code.gson gson + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.cea.mgt.common + provided org.wso2.carbon org.wso2.carbon.utils + provided 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.carbon org.wso2.carbon.user.api + provided org.wso2.carbon org.wso2.carbon.user.core + provided com.microsoft.azure diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml index a2d8e37aa7..09b64f7c6f 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml @@ -146,6 +146,7 @@ commons-codec.wso2 commons-codec + provided commons-codec @@ -208,10 +209,12 @@ com.google.code.gson gson + provided org.wso2.orbit.javax.xml.bind jaxb-api + provided diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml index 536ef97716..1be0fc557c 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml @@ -215,6 +215,23 @@ org.wso2.orbit.javax.xml.bind jaxb-api + provided + + + org.wso2.carbon + org.wso2.carbon.utils + provided + + + org.wso2.orbit.com.fasterxml.jackson.core + jackson-annotations + + + + + org.wso2.orbit.com.fasterxml.jackson.core + jackson-annotations + provided diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/GsonMessageBodyHandler.java b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/GsonMessageBodyHandler.java index ac09f2894a..11d03dbdbd 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/GsonMessageBodyHandler.java +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/src/main/java/io/entgra/device/mgt/core/certificate/mgt/cert/admin/api/common/GsonMessageBodyHandler.java @@ -18,7 +18,6 @@ package io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.common; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -30,9 +29,14 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.nio.charset.StandardCharsets; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; @@ -42,7 +46,6 @@ import static javax.ws.rs.core.MediaType.APPLICATION_JSON; public class GsonMessageBodyHandler implements MessageBodyWriter, MessageBodyReader { private Gson gson; - private static final String UTF_8 = "UTF-8"; public boolean isReadable(Class aClass, Type type, Annotation[] annotations, MediaType mediaType) { return true; @@ -60,12 +63,8 @@ public class GsonMessageBodyHandler implements MessageBodyWriter, Messag MultivaluedMap stringStringMultivaluedMap, InputStream entityStream) throws IOException, WebApplicationException { - InputStreamReader reader = new InputStreamReader(entityStream, "UTF-8"); - - try { + try (InputStreamReader reader = new InputStreamReader(entityStream, StandardCharsets.UTF_8)) { return getGson().fromJson(reader, type); - } finally { - reader.close(); } } @@ -81,11 +80,8 @@ public class GsonMessageBodyHandler implements MessageBodyWriter, Messag MultivaluedMap stringObjectMultivaluedMap, OutputStream entityStream) throws IOException, WebApplicationException { - OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8); - try { + try (OutputStreamWriter writer = new OutputStreamWriter(entityStream, StandardCharsets.UTF_8)) { getGson().toJson(object, type, writer); - } finally { - writer.close(); } } } diff --git a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml index 29ba28fbef..855c88d16a 100644 --- a/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml @@ -178,6 +178,7 @@ org.testng testng + test org.wso2.orbit.com.h2database @@ -217,18 +218,22 @@ io.entgra.com.google.code.jscep jscep + provided commons-codec.wso2 commons-codec + provided commons-io.wso2 commons-io + provided org.wso2.carbon org.wso2.carbon.utils + provided io.entgra.device.mgt.core @@ -248,10 +253,12 @@ org.wso2.carbon org.wso2.carbon.user.core + provided org.wso2.carbon.registry org.wso2.carbon.registry.indexing + provided org.slf4j @@ -266,6 +273,15 @@ com.googlecode.json-simple.wso2 json-simple + provided + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml index 8a2b0c836c..6afd192794 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml @@ -180,7 +180,7 @@ test - org.wso2.apache.httpcomponents + org.wso2.orbit.org.apache.httpcomponents httpclient test diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/pom.xml index a808eb1ab1..af9d0e7e11 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/pom.xml @@ -154,8 +154,8 @@ provided - commons-httpclient.wso2 - commons-httpclient + org.wso2.orbit.org.apache.httpcomponents + httpclient provided diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization/pom.xml index b190b05aa7..78e760693d 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization/pom.xml @@ -283,7 +283,7 @@ test - org.wso2.apache.httpcomponents + org.wso2.orbit.org.apache.httpcomponents httpclient test @@ -310,7 +310,7 @@ org.wso2.orbit.javax.xml.bind jaxb-api - test + provided diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml index 48443f1491..7af8ccdd0d 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml @@ -34,6 +34,11 @@ https://entgra.io + + com.google.code.gson + gson + provided + org.apache.felix org.apache.felix.scr.ds-annotations @@ -42,20 +47,41 @@ 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 + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.mgt.core + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.common provided + + org.ops4j.pax.logging + pax-logging-api + provided + + + org.wso2.orbit.javax.xml.bind + jaxb-api + provided + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml index c53a421ffa..5526e7b145 100644 --- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml +++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml @@ -17,7 +17,8 @@ ~ under the License. --> - + device-mgt-extensions @@ -42,54 +43,67 @@ org.wso2.carbon.governance org.wso2.carbon.governance.api + provided org.wso2.carbon org.wso2.carbon.registry.api + provided org.wso2.carbon org.wso2.carbon.registry.core + 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 + provided org.apache.ws.commons.axiom.wso2 axiom + provided org.wso2.carbon org.wso2.carbon.utils + provided io.entgra.org.scannotation scannotation + provided org.wso2.orbit.org.apache.tomcat tomcat + provided org.wso2.orbit.org.apache.tomcat tomcat-servlet-api + provided javax.ws.rs jsr311-api + provided org.apache.axis2.wso2 axis2 + provided commons-lang.wso2 commons-lang + provided org.eclipse.paho @@ -99,14 +113,17 @@ com.google.code.gson gson + provided org.json.wso2 json + provided org.wso2.carbon.analytics-common org.wso2.carbon.event.output.adapter.core + provided io.entgra.device.mgt.core @@ -116,6 +133,7 @@ org.testng testng + test org.powermock @@ -165,7 +183,7 @@ io.entgra.device.mgt.core.device.mgt.core.operation.mgt;version="${io.entgra.device.mgt.core.version.range}", io.entgra.device.mgt.core.device.mgt.core.service;version="${io.entgra.device.mgt.core.version.range}", org.apache.commons.logging;version="[1.2,2)", - org.osgi.service.*;version="${imp.package.version.osgi.service}", + org.osgi.service.component;version="${imp.package.version.osgi.service}", org.wso2.carbon.context;version="[4.8,5)", org.wso2.carbon.event.output.adapter.core;version="[5.3,6)", org.wso2.carbon.event.output.adapter.core.exception;version="[5.3,6)" @@ -220,5 +238,5 @@ - + 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 cc6ee9fc21..5e1909aad0 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 @@ -175,7 +175,7 @@ test - org.wso2.apache.httpcomponents + org.wso2.orbit.org.apache.httpcomponents httpclient test @@ -209,5 +209,10 @@ io.entgra.device.mgt.core.server.bootup.heartbeat.beacon provided + + org.wso2.orbit.javax.xml.bind + jaxb-api + provided + 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 e980421af9..94d7fcf0db 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 @@ -17,7 +17,8 @@ ~ under the License. --> - + device-mgt @@ -29,8 +30,8 @@ 4.0.0 io.entgra.device.mgt.core.device.mgt.api war - Entgra Device Management - Mobile Device Management API - Entgra Device Management - Mobile Device Management API + Entgra Device Management - Device Management API + Entgra Device Management - Device Management API https://entgra.io @@ -109,9 +110,10 @@ - + - + @@ -156,8 +158,8 @@ provided - commons-httpclient.wso2 - commons-httpclient + org.wso2.orbit.org.apache.httpcomponents + httpclient provided @@ -277,6 +279,7 @@ org.json.wso2 json + provided commons-codec.wso2 @@ -416,12 +419,6 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.application.mgt.common provided - - - org.wso2.orbit.javax.xml.bind - jaxb-api - - io.entgra.device.mgt.core @@ -468,10 +465,25 @@ jaxb-api provided + + org.wso2.orbit.com.fasterxml.jackson.core + jackson-annotations + provided + io.entgra.device.mgt.core io.entgra.device.mgt.core.tenant.mgt.common 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.transport.mgt.email.sender.core + test + \ No newline at end of file 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 3e9d8f7b0d..ee783b655b 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 @@ -120,14 +120,17 @@ org.wso2.orbit.com.fasterxml.jackson.core jackson-annotations + provided com.google.code.gson gson + provided org.wso2.orbit.javax.xml.bind jaxb-api + provided diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml index 6cf9047e82..5620f97f2e 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml @@ -17,7 +17,8 @@ ~ under the License. --> - + device-mgt @@ -84,7 +85,8 @@ src/test/resources/testng.xml - ${basedir}/target/coverage-reports/jacoco-unit.exec + ${basedir}/target/coverage-reports/jacoco-unit.exec + file:src/test/resources/log4j.properties @@ -112,9 +114,10 @@ - + - + @@ -167,24 +170,6 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.core provided - - - org.apache.axis2.wso2 - axis2-client - - - org.mockito - mockito-core - - - javassist - javassist - - - org.wso2.orbit.javax.xml.bind - jaxb-api - - io.entgra.device.mgt.core @@ -288,6 +273,12 @@ org.wso2.carbon.multitenancy org.wso2.carbon.tenant.mgt + provided + + + org.wso2.orbit.com.fasterxml.jackson.core + jackson-annotations + provided 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 93bc5da774..4ace1c61db 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 @@ -141,7 +141,7 @@ javax.net.ssl, javax.servlet;version="[2.6,3)", javax.sql, - javax.ws.rs, + javax.ws.rs;version="[2.1,3)", javax.xml.bind;version="[0.0,1)", javax.xml.bind.annotation;version="[0.0,1)", javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}", @@ -240,27 +240,27 @@ io.entgra.org.scannotation scannotation + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common - - - org.ops4j.pax.logging - pax-logging-api provided org.wso2.carbon org.wso2.carbon.utils + provided org.wso2.carbon org.wso2.carbon.core + provided org.wso2.carbon org.wso2.carbon.ndatasource.core + provided commons-lang @@ -276,6 +276,7 @@ org.testng testng + test org.powermock @@ -285,10 +286,12 @@ org.wso2.carbon org.wso2.carbon.user.core + provided org.wso2.carbon org.wso2.carbon.user.api + provided org.wso2.carbon @@ -303,55 +306,66 @@ org.wso2.orbit.org.apache.tomcat jdbc-pool + provided org.wso2.carbon org.wso2.carbon.base + provided org.wso2.carbon.governance org.wso2.carbon.governance.api + provided org.apache.axis2.transport axis2-transport-mail + provided org.apache.ws.commons.axiom.wso2 axiom + provided org.apache.axis2.wso2 axis2 + provided org.wso2.carbon.identity.inbound.auth.oauth2 org.wso2.carbon.identity.oauth.stub + provided org.wso2.orbit.org.apache.tomcat tomcat + provided org.wso2.orbit.org.apache.tomcat tomcat-servlet-api + provided org.wso2.carbon.commons org.wso2.carbon.ntask.core + provided - commons-collections.wso2 commons-collections + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.transport.mgt.email.sender.core + provided @@ -363,6 +377,7 @@ com.google.code.gson gson + provided @@ -373,10 +388,12 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.annotations + provided org.wso2.carbon.event-processing org.wso2.carbon.event.processor.stub + provided io.entgra.device.mgt.core @@ -392,10 +409,12 @@ javax.ws.rs javax.ws.rs-api + provided javax.ws.rs jsr311-api + provided org.javassist @@ -405,18 +424,22 @@ org.powermock powermock-api-mockito2 + test org.wso2.carbon.multitenancy org.wso2.carbon.tenant.mgt + provided commons-validator commons-validator + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.server.bootup.heartbeat.beacon + provided com.google.guava @@ -426,20 +449,22 @@ com.squareup.okhttp3 okhttp - compile + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.task.mgt.common + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.extensions.logger + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.notification.logger - + provided org.wso2.orbit.javax.xml.bind @@ -459,6 +484,17 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.apimgt.extension.rest.api + provided + + + org.wso2.orbit.org.apache.httpcomponents + httpclient + + + + com.fasterxml.jackson.core + jackson-databind + provided diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/authorization/GroupAccessAuthorizationServiceImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/authorization/GroupAccessAuthorizationServiceImpl.java index 2f796f929f..ee0b5c01bf 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/authorization/GroupAccessAuthorizationServiceImpl.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/authorization/GroupAccessAuthorizationServiceImpl.java @@ -29,13 +29,11 @@ import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHo import io.entgra.device.mgt.core.device.mgt.core.permission.mgt.PermissionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.opensaml.xmlsec.signature.G; import org.wso2.carbon.CarbonConstants; import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.user.api.UserRealm; import org.wso2.carbon.user.api.UserStoreException; -import javax.persistence.criteria.CriteriaBuilder; import java.util.List; public class GroupAccessAuthorizationServiceImpl implements GroupAccessAuthorizationService { diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/group/PostgreSQLGroupDAOImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/group/PostgreSQLGroupDAOImpl.java index 2d17e8bdbb..acb2727c6f 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/group/PostgreSQLGroupDAOImpl.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/group/PostgreSQLGroupDAOImpl.java @@ -26,7 +26,7 @@ import io.entgra.device.mgt.core.device.mgt.core.dao.GroupManagementDAOFactory; import io.entgra.device.mgt.core.device.mgt.core.dao.impl.AbstractGroupDAOImpl; import io.entgra.device.mgt.core.device.mgt.core.dao.util.DeviceManagementDAOUtil; import io.entgra.device.mgt.core.device.mgt.core.dao.util.GroupManagementDAOUtil; -import org.apache.solr.common.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/DeviceManagerUtil.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/DeviceManagerUtil.java index 3965b1cc77..c70dfe9185 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/DeviceManagerUtil.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/DeviceManagerUtil.java @@ -19,7 +19,6 @@ package io.entgra.device.mgt.core.device.mgt.core.util; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import io.entgra.device.mgt.core.device.mgt.core.config.metadata.mgt.MetaDataConfiguration; import io.entgra.device.mgt.core.device.mgt.core.config.metadata.mgt.whitelabel.WhiteLabelConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -83,20 +82,6 @@ import io.entgra.device.mgt.core.identity.jwt.client.extension.JWTClient; import io.entgra.device.mgt.core.identity.jwt.client.extension.dto.AccessTokenInfo; import io.entgra.device.mgt.core.identity.jwt.client.extension.exception.JWTClientException; import io.entgra.device.mgt.core.identity.jwt.client.extension.service.JWTClientManagerService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.protocol.HTTP; -import org.w3c.dom.Document; -import org.wso2.carbon.base.MultitenantConstants; -import org.wso2.carbon.caching.impl.CacheImpl; -import org.wso2.carbon.context.CarbonContext; -import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.user.api.*; import org.wso2.carbon.user.core.config.RealmConfigXMLProcessor; import org.wso2.carbon.utils.CarbonUtils; diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/HttpReportingUtil.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/HttpReportingUtil.java index 5f9200fa80..5a74fc98ff 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/HttpReportingUtil.java +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/HttpReportingUtil.java @@ -18,24 +18,11 @@ package io.entgra.device.mgt.core.device.mgt.core.util; -import io.entgra.device.mgt.core.device.mgt.common.exceptions.EventPublishingException; import io.entgra.device.mgt.core.device.mgt.core.DeviceManagementConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.protocol.HTTP; import org.json.JSONObject; -import java.io.IOException; -import java.net.ConnectException; - public class HttpReportingUtil { private static final Log log = LogFactory.getLog(HttpReportingUtil.class); diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml index c407639b3f..8bf35246e7 100644 --- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml +++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml @@ -42,30 +42,37 @@ org.wso2.carbon.governance org.wso2.carbon.governance.api + provided org.wso2.carbon org.wso2.carbon.registry.api + provided org.wso2.carbon org.wso2.carbon.registry.core + 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 + provided org.apache.ws.commons.axiom.wso2 axiom + provided org.wso2.carbon org.wso2.carbon.utils + provided org.eclipse.platform @@ -76,6 +83,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core + provided org.testng @@ -157,6 +165,19 @@ io.entgra.device.mgt.core.notification.logger provided + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.transport.mgt.email.sender.core + test + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + diff --git a/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml index e0fa9efd0c..be80968552 100644 --- a/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml +++ b/components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml @@ -97,45 +97,50 @@ org.apache.felix.scr.ds-annotations provided - - org.ops4j.pax.logging - pax-logging-api - org.wso2.carbon org.wso2.carbon.utils + provided org.testng testng + test org.wso2.carbon org.wso2.carbon.base + provided org.apache.axis2.wso2 axis2 + provided commons-io.wso2 commons-io + provided org.apache.axis2.transport axis2-transport-mail + provided commons-collections.wso2 commons-collections + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common + provided org.wso2.carbon org.wso2.carbon.ndatasource.core + provided log4j diff --git a/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml index 899434ada5..157acab172 100644 --- a/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml +++ b/components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml @@ -42,50 +42,62 @@ org.wso2.carbon.governance org.wso2.carbon.governance.api + provided org.wso2.carbon org.wso2.carbon.registry.api + provided org.wso2.carbon org.wso2.carbon.registry.core + provided org.apache.ws.commons.axiom.wso2 axiom + provided org.wso2.carbon org.wso2.carbon.utils + provided io.entgra.org.scannotation scannotation + provided org.wso2.orbit.org.apache.tomcat tomcat + provided org.wso2.orbit.org.apache.tomcat tomcat-servlet-api + provided javax.ws.rs jsr311-api + provided org.apache.axis2.wso2 axis2 + provided commons-lang.wso2 commons-lang + provided org.wso2.carbon.registry org.wso2.carbon.registry.indexing + provided org.opensaml @@ -100,22 +112,27 @@ org.wso2.orbit.com.nimbusds nimbus-jose-jwt + provided com.googlecode.json-simple.wso2 json-simple + provided org.apache.httpcomponents.wso2 httpcore + provided org.wso2.orbit.org.apache.httpcomponents httpclient + provided commons-codec.wso2 commons-codec + provided org.ops4j.pax.logging @@ -166,6 +183,7 @@ org.wso2.orbit.javax.xml.bind jaxb-api + provided diff --git a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml index 6083a4ab51..63a412e718 100644 --- a/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml +++ b/components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml @@ -354,6 +354,16 @@ org.wso2.orbit.javax.xml.bind jaxb-api + provided + + + org.apache.axis2.wso2 + axis2-client + test + + + org.wso2.orbit.org.apache.httpcomponents + httpclient test diff --git a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml index 4f0acc31ed..49c9012878 100644 --- a/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml +++ b/components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml @@ -171,56 +171,86 @@ org.wso2.carbon org.wso2.carbon.utils + provided org.wso2.carbon org.wso2.carbon.core + provided org.wso2.carbon org.wso2.carbon.base + provided org.wso2.carbon org.wso2.carbon.ndatasource.core + provided org.wso2.carbon org.wso2.carbon.ndatasource.rdbms + provided org.wso2.carbon.commons org.wso2.carbon.ntask.core + provided org.wso2.carbon org.wso2.carbon.registry.api + provided org.wso2.carbon org.wso2.carbon.registry.core + provided io.entgra.device.mgt.core io.entgra.device.mgt.core.policy.mgt.common + provided com.google.code.gson gson + 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 + provided + + + io.entgra.device.mgt.core + io.entgra.device.mgt.core.notification.logger + provided + + + org.wso2.orbit.javax.xml.bind + jaxb-api + provided + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl @@ -233,6 +263,7 @@ org.wso2.orbit.org.apache.tomcat jdbc-pool + test mysql @@ -244,21 +275,16 @@ h2 test - - commons-dbcp.wso2 commons-dbcp test - commons-pool.wso2 commons-pool test - - org.powermock powermock-api-mockito2 @@ -279,19 +305,15 @@ io.entgra.device.mgt.core.server.bootup.heartbeat.beacon test - - org.wso2.orbit.javax.xml.bind - jaxb-api - io.entgra.device.mgt.core - io.entgra.device.mgt.core.notification.logger - provided + io.entgra.device.mgt.core.transport.mgt.email.sender.core + test - org.wso2.orbit.javax.xml.bind - jaxb-api - provided + org.wso2.orbit.org.apache.httpcomponents + httpclient + test diff --git a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml index 23d7cca0e9..2b6948dbec 100644 --- a/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml +++ b/components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml @@ -368,7 +368,7 @@ test - org.wso2.apache.httpcomponents + org.wso2.orbit.org.apache.httpcomponents httpclient test @@ -395,7 +395,7 @@ org.wso2.orbit.javax.xml.bind jaxb-api - test + provided \ No newline at end of file diff --git a/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml index 6dd1ba7ff5..07a097abf4 100644 --- a/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml +++ b/components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml @@ -111,30 +111,37 @@ org.testng testng + test org.wso2.carbon org.wso2.carbon.base + provided org.apache.axis2.wso2 axis2 + provided org.apache.velocity velocity-engine-core + provided commons-io.wso2 commons-io + provided org.apache.axis2.transport axis2-transport-mail + provided commons-collections.wso2 commons-collections + provided org.wso2.orbit.javax.xml.bind diff --git a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml index a9f9ab1dea..71c929174e 100644 --- a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml @@ -17,7 +17,8 @@ ~ under the License. --> - + io.entgra.device.mgt.core @@ -66,9 +67,10 @@ - + - + @@ -149,6 +151,11 @@ io.entgra.device.mgt.core.transport.mgt.sms.handler.common provided + + com.google.code.gson + gson + provided + diff --git a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/GsonMessageBodyHandler.java b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/GsonMessageBodyHandler.java index 4aa7334727..4ad7b66540 100644 --- a/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/GsonMessageBodyHandler.java +++ b/components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/src/main/java/io/entgra/device/mgt/core/transport/mgt/sms/handler/api/addons/GsonMessageBodyHandler.java @@ -27,12 +27,12 @@ import javax.ws.rs.core.MultivaluedMap; import java.io.*; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.nio.charset.StandardCharsets; public class GsonMessageBodyHandler { public static final String DATE_FORMAT = "EEE, d MMM yyyy HH:mm:ss Z"; private Gson gson; - private static final String UTF_8 = "UTF-8"; public boolean isReadable(Class aClass, Type type, Annotation[] annotations, MediaType mediaType) { return true; @@ -50,12 +50,8 @@ public class GsonMessageBodyHandler { MultivaluedMap stringStringMultivaluedMap, InputStream entityStream) throws IOException, WebApplicationException { - InputStreamReader reader = new InputStreamReader(entityStream, "UTF-8"); - - try { + try (InputStreamReader reader = new InputStreamReader(entityStream, StandardCharsets.UTF_8)) { return getGson().fromJson(reader, type); - } finally { - reader.close(); } } @@ -71,11 +67,8 @@ public class GsonMessageBodyHandler { MultivaluedMap stringObjectMultivaluedMap, OutputStream entityStream) throws IOException, WebApplicationException { - OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8); - try { + try (OutputStreamWriter writer = new OutputStreamWriter(entityStream, StandardCharsets.UTF_8)) { getGson().toJson(object, type, writer); - } finally { - writer.close(); } } } 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..50371a165f 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 @@ -162,7 +162,7 @@ provided - commons-httpclient + httpclient commons-httpclient diff --git a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml index 5da570acdc..e7d26093f3 100644 --- a/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml +++ b/components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml @@ -243,8 +243,8 @@ httpclient - commons-httpclient.wso2 - commons-httpclient + org.wso2.orbit.org.apache.httpcomponents + httpclient commons-pool.wso2 diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml index 91aa55a3ae..06adf26b6a 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml @@ -103,6 +103,9 @@ org.wso2.carbon.registry:org.wso2.carbon.registry.indexing:${carbon.registry.version} + + javax.ws.rs:javax.ws.rs-api:${javax.ws.rs.version} + diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml index ce63bf6e92..9eca1eafb1 100644 --- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml @@ -43,6 +43,10 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common + + com.sun.jersey + jersey-core + @@ -98,7 +102,9 @@ io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.common:${io.entgra.device.mgt.core.version} - com.sun.jersey:jersey-core + + com.sun.jersey:jersey-core:${jersey.version} + org.wso2.carbon.core.server:${carbon.kernel.version} diff --git a/pom.xml b/pom.xml index 48cdcf3eb2..d70b0c27b9 100644 --- a/pom.xml +++ b/pom.xml @@ -82,103 +82,11 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.core ${io.entgra.device.mgt.core.version} - - - io.entgra.device.mgt.core - io.entgra.device.mgt.core.device.mgt.common - - - org.wso2.carbon - org.wso2.carbon.utils - - - org.wso2.carbon - org.wso2.carbon.base - - - org.wso2.carbon - org.wso2.carbon.core - - - org.wso2.carbon - org.wso2.carbon.user.core - - - org.wso2.carbon - org.wso2.carbon.user.api - - - org.wso2.carbon - org.wso2.carbon.registry.api - - - org.wso2.carbon - org.wso2.carbon.registry.core - - - org.apache.tomcat.wso2 - jdbc-pool - - - org.wso2.carbon.governance - org.wso2.carbon.governance.api - - - org.apache.axis2.transport - axis2-transport-mail - - - org.apache.ws.commons.axiom - axiom-api - - - org.apache.ws.commons.axiom - axiom-impl - - - org.apache.ws.commons.axiom.wso2 - axiom - - - org.wso2.carbon.identity - org.wso2.carbon.identity.oauth.stub - - - org.apache.axis2.wso2 - axis2 - - - org.wso2.carbon - org.wso2.carbon.ndatasource.core - - - org.wso2.carbon - org.wso2.carbon.logging - - - org.wso2.tomcat - tomcat - - - org.wso2.tomcat - tomcat-servlet-api - - - org.eclipse.osgi - org.eclipse.osgi - - io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.common ${io.entgra.device.mgt.core.version} - - - com.fasterxml.jackson.core - jackson-annotations - - io.entgra.device.mgt.core @@ -244,12 +152,6 @@ io.entgra.device.mgt.core io.entgra.device.mgt.core.device.mgt.oauth.extensions ${io.entgra.device.mgt.core.version} - - - org.wso2.carbon.identity - org.wso2.carbon.identity.oauth - - io.entgra.device.mgt.core @@ -375,7 +277,6 @@ ${io.entgra.device.mgt.core.version} - io.entgra.device.mgt.core @@ -492,8 +393,8 @@ poi-scratchpad - commons-httpclient.wso2 - commons-httpclient + org.wso2.orbit.org.apache.httpcomponents + httpclient commons-pool.wso2 @@ -530,6 +431,10 @@ org.mockito mockito-core + + org.wso2.org.ops4j.pax.logging + pax-logging-api + @@ -690,8 +595,8 @@ javax.servlet - commons-httpclient.wso2 - commons-httpclient + org.wso2.orbit.org.apache.httpcomponents + httpclient org.wso2.carbon @@ -805,6 +710,10 @@ xerces.wso2 xercesImpl + + org.wso2.org.ops4j.pax.logging + pax-logging-api + @@ -836,12 +745,6 @@ ${orbit.h2.version} - - org.wso2.apache.httpcomponents - httpclient - ${org.wso2.apache.httpcomponents.httpclient.version} - - org.wso2.securevault org.wso2.securevault @@ -866,6 +769,11 @@ jaxb-api ${version.org.wso2.orbit.javax.xml.bind} + + org.apache.axis2.wso2 + axis2-client + ${axis2.orbit.version} + com.sun.xml.bind jaxb-core @@ -876,13 +784,6 @@ jaxb-impl 2.3.1 - - org.wso2.orbit.javax.xml.bind - jaxb-api - 2.3.1.wso2v1 - compile - - org.apache.axis2.transport axis2-transport-mail @@ -917,19 +818,8 @@ pdfbox ${orbit.version.pdfbox} - - - org.apache.ws.commons.axiom.wso2 - axiom-api - ${axiom.version} - - - org.apache.ws.commons.axiom.wso2 - axiom-impl - ${axiom.version} - org.apache.ws.commons.axiom.wso2 axiom @@ -1061,11 +951,6 @@ org.wso2.carbon.identity.oauth2.grant.jwt ${carbon.identity.jwt.grant.version} - - org.wso2.carbon.identity.framework - org.wso2.carbon.identity.application.authentication.framework - ${carbon.identity.framework.version} - org.wso2.carbon.identity.inbound.auth.oauth2 org.wso2.carbon.identity.oauth @@ -1089,11 +974,6 @@ - - org.wso2.carbon.identity.framework - org.wso2.carbon.identity.application.common - ${carbon.identity.framework.version} - org.wso2.carbon.identity.framework org.wso2.carbon.user.mgt @@ -1190,73 +1070,6 @@ ${cxf.version} - - org.wso2.carbon.identity.framework - org.wso2.carbon.identity.application.mgt - ${carbon.identity.framework.version} - - - org.wso2.carbon.identity - org.wso2.carbon.directory.server.manager - - - org.wso2.carbon - javax.cache.wso2 - - - org.wso2.carbon - org.wso2.carbon.core - - - org.wso2.carbon - org.wso2.carbon.user.core - - - org.wso2.carbon - org.wso2.carbon.registry.core - - - commons-lang.wso2 - commons-lang - - - org.apache.ws.commons.axiom.wso2 - axiom - - - org.wso2.carbon.identity - org.wso2.carbon.identity.application.common - - - org.wso2.carbon.identity - org.wso2.carbon.idp.mgt - - - org.wso2.carbon.identity - org.wso2.carbon.identity.core - - - org.wso2.carbon.identity - org.wso2.carbon.user.mgt - - - org.wso2.carbon.identity - org.wso2.carbon.user.mgt.stub - - - org.wso2.carbon.identity - org.wso2.carbon.user.mgt - - - commons-codec.wso2 - commons-codec - - - org.wso2.carbon - org.wso2.carbon.logging - - - com.googlecode.json-simple.wso2 json-simple @@ -1273,7 +1086,6 @@ ${jackson.version} - org.wso2.carbon.commons org.wso2.carbon.ntask.core @@ -1283,6 +1095,10 @@ org.slf4j slf4j-api + + org.ops4j.pax.logging + pax-logging-api + @@ -1360,40 +1176,19 @@ io.github.openfeign feign-okhttp - ${github.openfeign.version} + ${io.github.openfeign.version} org.apache.httpcomponents.client5 httpclient5 ${apache.http.client.version} - - - org.apache.neethi.wso2 - neethi - ${neethi.wso2.version} - - - org.apache.neethi - neethi - ${neethi.version} - - - commons-codec - commons-codec - ${commons.codec.verision} - commons-pool.wso2 commons-pool ${commons.pool.wso2.version} - - commons-httpclient.wso2 - commons-httpclient - ${commons.httpclient.version} - org.apache.velocity velocity-engine-core @@ -1434,26 +1229,11 @@ org.wso2.carbon.event.publisher.core ${carbon.analytics.common.version} - - org.wso2.carbon.analytics-common - org.wso2.carbon.event.core - ${carbon.analytics.common.version} - org.wso2.carbon.analytics-common org.wso2.carbon.event.output.adapter.rdbms ${carbon.analytics.common.version} - - org.wso2.carbon.analytics-common - org.wso2.carbon.databridge.commons - ${carbon.analytics.common.version} - - - org.wso2.carbon.analytics-common - org.wso2.carbon.databridge.agent - ${carbon.analytics.common.version} - @@ -1480,22 +1260,6 @@ - - org.wso2.carbon.registry - org.wso2.carbon.registry.common - ${carbon.registry.version} - - - org.wso2.carbon.identity - org.wso2.carbon.user.mgt.stub - - - org.wso2.carbon.identity - org.wso2.carbon.user.mgt - - - - io.entgra.org.scannotation scannotation @@ -1518,18 +1282,6 @@ ${httpclient.version} - - - org.igniterealtime.smack.wso2 - smack - ${smack.wso2.version} - - - org.igniterealtime.smack.wso2 - smackx - ${smackx.wso2.version} - - org.eclipse.paho org.eclipse.paho.client.mqttv3 @@ -1637,11 +1389,6 @@ io.entgra.device.mgt.core.device.mgt.extensions.device.organization ${io.entgra.device.mgt.core.version} - - io.entgra.device.mgt.core - io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api - ${io.entgra.device.mgt.core.version} - org.wso2.orbit.com.fasterxml.jackson.core jackson-annotations @@ -1659,11 +1406,6 @@ - - org.wso2.orbit.joda-time - joda-time - ${joda-time.version} - org.wso2.orbit.org.owasp.encoder encoder @@ -1690,16 +1432,6 @@ ${jersey.version} - - org.apache.synapse - synapse-core - ${org.apache.synapse.version} - - - org.apache.ws.security.wso2 - wss4j - ${org.apache.ws.security.wso2.version} - io.github.openfeign feign-core @@ -1797,23 +1529,12 @@ javax.websocket-api ${javax.websocket.version} - - org.apache.tomcat - tomcat-websocket-api - ${tomcat.websocket.version} - provided - org.wso2.carbon.multitenancy org.wso2.carbon.tenant.mgt ${carbon.multitenancy.version} provided - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven.checkstyle.vesion} - commons-validator commons-validator @@ -1834,11 +1555,6 @@ mockito-inline ${mokito.version} - - com.google.auth - google-auth-library-oauth2-http - ${com.google.auth.library.auth2.http.version} - org.wso2.orbit.com.google.http-client google-http-client @@ -2090,7 +1806,6 @@ 2.2.1 - 7.4.0 4.8.1 [4.8.0, 5.0.0) 5.1.2 @@ -2100,15 +1815,9 @@ 1.6.1-wso2v85 1.1.0-wso2v10 - 1.0.0.Final - 4.13.1 - - - 3.6.200.v20130402-1505 - 3.3.100.v20120522-1822 - 3.8.1.v20120830-144521 + 7.4.0 9.0.71.wso2v1 @@ -2117,12 +1826,11 @@ 5.24.8 [5.14.0, 6.0.0) 6.9.6 + [6.0.0, 7.0.0) 2.1.1 [2.1.1, 3.0.0) [5.14.0, 6.0.0) - [6.0.0, 7.0.0) - 4.9.20 @@ -2131,8 +1839,6 @@ 4.8.30 - 1.2.11-wso2v25 - [1.2.11, 1.3.0) 1.2.11-wso2v25 @@ -2185,7 +1891,6 @@ 32.1.3-jre 4.12.0 3.6.0 - 11.0 1.1.1 1.2 5.2.1 @@ -2194,10 +1899,6 @@ 4.5.10 1.9 - - 3.1.1 - 2.0.4.wso2v4 - 1.0.3.entgrav1 [1.0.3, 2.0.0) @@ -2206,7 +1907,6 @@ 4.3.1.wso2v2 [4.3.1, 5.0.0) 4.4.16.wso2v1 - 3.1.0.wso2v2 4.2.5.wso2v1 2.3 @@ -2236,7 +1936,6 @@ 1.0.10 2.9.8.wso2v1 2.6.1.wso2v3 - 2.8.2.wso2v1 1.2.0.wso2v1 5.1.2.Final @@ -2294,8 +1993,6 @@ 2.23.4 2.8.1.wso2v2 - 4.3.1.wso2v1 - 2.1.214.wso2v1 1.1.3