diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml index 5f836c184..6c347c9e4 100644 --- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml +++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml @@ -36,7 +36,6 @@ maven-antrun-plugin - 1.7 process-resources @@ -53,7 +52,6 @@ maven-assembly-plugin - 2.5.5 ${project.artifactId}-${io.entgra.device.mgt.plugins.version} false diff --git a/components/analytics/pom.xml b/components/analytics/pom.xml index cb3c65d69..99132b5a1 100644 --- a/components/analytics/pom.xml +++ b/components/analytics/pom.xml @@ -36,23 +36,22 @@ iot-analytics - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml index 504cde055..42795c59c 100644 --- a/components/device-types/pom.xml +++ b/components/device-types/pom.xml @@ -36,24 +36,24 @@ virtual-fire-alarm-plugin - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml index 1722ccde5..d58d0f832 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml @@ -41,8 +41,11 @@ UTF-8 ${wso2.maven.compiler.source} ${wso2.maven.compiler.target} + + --add-exportsjava.base/sun.security.x509=ALL-UNNAMED + - 2.3.2 + @@ -84,7 +87,6 @@ log4j log4j - ${log4j.version} @@ -92,45 +94,38 @@ org.eclipse.jetty jetty-server - ${jetty.version} org.eclipse.paho org.eclipse.paho.client.mqttv3 - ${paho.mqtt.version} org.igniterealtime.smack.wso2 smack - ${smack.wso2.version} org.igniterealtime.smack.wso2 smackx - ${smackx.wso2.version} org.bouncycastle.wso2 bcprov-jdk15on - ${bcprov.wso2.version} org.bouncycastle.wso2 bcpkix-jdk15on - ${bcpkix.wso2.version} com.google.code.jscep.wso2 jscep - ${jscep.version} @@ -141,31 +136,26 @@ commons-lang commons-lang - ${commons-lang.version} commons-logging commons-logging - ${common-logging.version} - commons-io + commons-io.wso2 commons-io - ${commons.io} org.slf4j slf4j-api - ${slf4j.version} org.slf4j slf4j-simple - ${slf4j.version} @@ -176,62 +166,61 @@ commons-configuration commons-configuration - 1.10 - - - wso2-nexus - WSO2 internal Repository - http://maven.wso2.org/nexus/content/groups/wso2-public/ - - true - daily - ignore - - - - wso2-maven2-repository - http://dist.wso2.org/maven2 - - - - - - - 1.7 - 1.7 - - - 8.1.3.v20120416 - - - 1.0.2 - - - 3.0.4.wso2v1 - 3.0.4.wso2v1 - - - 1.49.wso2v1 - 1.49.wso2v1 - - - 2.0.2.wso2v2 - - - 1.2.17 - 1.2 - 2.4 - 1.7 - 2.6 - - - 1.7.13 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml index 598be9ad6..69b57648e 100644 --- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml @@ -32,9 +32,7 @@ WSO2 Carbon - Virtual FireAlarm Service Management API Implementation http://wso2.org - - 2.7.18 - + @@ -96,7 +94,6 @@ org.apache.httpcomponents httpasyncclient - 4.1 provided @@ -233,17 +230,14 @@ provided - org.apache.cxf + org.apache.cxf.wso2 cxf-bundle - 3.0.0-milestone2 test org.apache.cxf cxf-bundle-jaxrs provided - ${cxf-bundle-package.version} - diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml index fc0ca1ab1..a028b52a5 100644 --- a/components/device-types/virtual-fire-alarm-plugin/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml @@ -37,23 +37,23 @@ io.entgra.device.mgt.plugins.virtualfirealarm.api - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml index 0f6343256..4bfd6f832 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml @@ -36,14 +36,14 @@ org.apache.felix maven-scr-plugin - - - generate-scr-descriptor - - scr - - - + + + + + + + + org.apache.maven.plugins @@ -107,8 +107,8 @@ - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api com.googlecode.json-simple.wso2 diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml index 380b65d46..97974fdcd 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml @@ -37,8 +37,8 @@ org.wso2.carbon.event.input.adapter.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.wso2.carbon @@ -103,14 +103,14 @@ org.apache.felix maven-scr-plugin - - - generate-scr-descriptor - - scr - - - + + + + + + + + org.apache.maven.plugins diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml index e2d044d98..e282106f7 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml @@ -41,8 +41,8 @@ org.wso2.carbon.event.input.adapter.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.wso2.carbon @@ -95,14 +95,14 @@ org.apache.felix maven-scr-plugin - - - generate-scr-descriptor - - scr - - - + + + + + + + + org.apache.maven.plugins diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml index b3a7c7042..dfc39049e 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml @@ -44,8 +44,8 @@ org.wso2.carbon.event.input.adapter.wso2event - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.wso2.carbon @@ -75,14 +75,14 @@ org.apache.felix maven-scr-plugin - - - generate-scr-descriptor - - scr - - - + + + + + + + + org.apache.maven.plugins diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml index 3a2e46591..5c360ff73 100644 --- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml @@ -37,8 +37,8 @@ org.wso2.carbon.event.input.adapter.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.wso2.carbon @@ -79,14 +79,14 @@ org.apache.felix maven-scr-plugin - - - generate-scr-descriptor - - scr - - - + + + + + + + + org.apache.maven.plugins diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml index aaa6624be..212c6df7a 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml @@ -39,8 +39,8 @@ org.wso2.carbon.event.output.adapter.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.apache.httpcomponents.wso2 @@ -69,14 +69,14 @@ org.apache.felix maven-scr-plugin - - - generate-scr-descriptor - - scr - - - + + + + + + + + diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml index eb26dd588..2001fb6eb 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml @@ -50,8 +50,8 @@ org.wso2.carbon.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.apache.httpcomponents.wso2 @@ -83,14 +83,14 @@ org.apache.felix maven-scr-plugin - - - generate-scr-descriptor - - scr - - - + + + + + + + + diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml index 762eecfe3..2e6894448 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml @@ -40,8 +40,8 @@ org.wso2.carbon.event.output.adapter.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.wso2.carbon @@ -106,14 +106,14 @@ org.apache.felix maven-scr-plugin - - - generate-scr-descriptor - - scr - - - + + + + + + + + org.apache.maven.plugins diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml index fe35d0cdb..96afa1e13 100644 --- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml +++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml @@ -43,8 +43,8 @@ org.wso2.carbon.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.igniterealtime.smack.wso2 @@ -60,14 +60,14 @@ org.apache.felix maven-scr-plugin - - - generate-scr-descriptor - - scr - - - + + + + + + + + diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml index 1b90ea40c..8161c0810 100644 --- a/components/extensions/cdmf-transport-adapters/pom.xml +++ b/components/extensions/cdmf-transport-adapters/pom.xml @@ -45,23 +45,23 @@ output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + 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 7cf763921..9ac5970e9 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 @@ -87,7 +87,6 @@ org.xolstice.maven.plugins protobuf-maven-plugin - 0.6.1 com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier} grpc-java diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml index 89a939f37..03a842417 100644 --- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml +++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml @@ -52,14 +52,12 @@ org.apache.maven.wagon wagon-ssh - 2.1 org.apache.maven.plugins maven-compiler-plugin - 3.2 ${wso2.maven.compiler.source} ${wso2.maven.compiler.target} @@ -68,20 +66,18 @@ org.apache.felix maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - + + + + + + + + org.apache.felix maven-bundle-plugin - 1.4.0 true diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml index 330656a18..d1352ae65 100644 --- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml +++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml @@ -38,8 +38,8 @@ maven-compiler-plugin - 1.7 - 1.7 + 17 + 17 @@ -87,7 +87,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 compile @@ -117,7 +116,6 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 test @@ -169,8 +167,8 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided diff --git a/components/extensions/mb-extensions/pom.xml b/components/extensions/mb-extensions/pom.xml index 90bb868a0..e61f93a05 100644 --- a/components/extensions/mb-extensions/pom.xml +++ b/components/extensions/mb-extensions/pom.xml @@ -37,23 +37,23 @@ org.wso2.carbon.andes.extensions.device.mgt.api - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml index 3bca24271..812ad1fbb 100644 --- a/components/extensions/pom.xml +++ b/components/extensions/pom.xml @@ -40,23 +40,23 @@ siddhi-extensions - - - - - org.apache.felix - maven-scr-plugin - ${maven.scr.version} - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml index 64051d973..5a2187fc2 100644 --- a/components/extensions/pull-notification-listeners/pom.xml +++ b/components/extensions/pull-notification-listeners/pom.xml @@ -36,23 +36,23 @@ io.entgra.device.mgt.plugins.mqtt.notification.listener - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml index 87418eeaa..9193ab39a 100644 --- a/components/extensions/siddhi-extensions/pom.xml +++ b/components/extensions/siddhi-extensions/pom.xml @@ -37,23 +37,23 @@ io.entgra.device.mgt.plugins.extension.siddhi.execution.json - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + 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 12c34c66d..7c7848990 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 @@ -36,14 +36,12 @@ maven-compiler-plugin - 1.8 - 1.8 + 17 + 17 - 2.3.2 maven-war-plugin - 2.2 WEB-INF/lib/*cxf*.jar api#device-mgt#android#v1.0 @@ -99,7 +97,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.7 compile @@ -156,7 +153,6 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 test @@ -205,8 +201,8 @@ provided - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api provided diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml index c2286cf2b..405f7049f 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml @@ -105,7 +105,6 @@ maven-assembly-plugin - 2.5.5 ${project.artifactId}-${io.entgra.device.mgt.plugins.version} false 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 6b7fb22f2..fa6e76452 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 @@ -46,7 +46,6 @@ org.apache.felix maven-bundle-plugin - 1.4.0 true @@ -128,8 +127,8 @@ org.wso2.carbon.core - org.wso2.carbon - org.wso2.carbon.logging + org.ops4j.pax.logging + pax-logging-api org.wso2.carbon diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml index d0f00dea3..230d6b61d 100644 --- a/components/mobile-plugins/android-plugin/pom.xml +++ b/components/mobile-plugins/android-plugin/pom.xml @@ -39,23 +39,22 @@ io.entgra.device.mgt.plugins.mobile.android.ui - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml index 00143b615..2f3c1d014 100644 --- a/components/mobile-plugins/pom.xml +++ b/components/mobile-plugins/pom.xml @@ -36,23 +36,23 @@ android-plugin - - - - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml index b9190464c..d458d3afb 100644 --- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml +++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml @@ -49,7 +49,6 @@ org.wso2.orbit.com.h2database h2 - ${orbit.h2.version} diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml index 10b854a3e..8e9c89df6 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml @@ -68,7 +68,6 @@ maven-resources-plugin - 2.6 copy-resources diff --git a/pom.xml b/pom.xml index 6985fdf34..01d7a5f70 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.wso2 wso2 - 1 + 1.3 @@ -97,25 +97,6 @@ org.wso2.carbon.base ${carbon.kernel.version} - - org.wso2.carbon - org.wso2.carbon.logging - ${carbon.logging.version} - - - org.apache.log4j.wso2 - log4j - - - commons-logging - commons-logging - - - org.wso2.carbon - org.wso2.carbon.bootstrap - - - org.wso2.carbon org.wso2.carbon.utils @@ -324,17 +305,17 @@ org.wso2.carbon.databridge.commons ${carbon.commons.version} - - org.wso2.carbon.analytics-common - org.wso2.carbon.databridge.agent - ${carbon.analytics.common.version} - - - commons-codec.wso2 - commons-codec - - - + + + + + + + + + + + org.wso2.carbon.analytics-common org.wso2.carbon.event.output.adapter.core @@ -526,7 +507,7 @@ org.eclipse.osgi org.eclipse.osgi.services - 3.3.100.v20120522-1822 + ${eclipse.equinox.services.version} @@ -553,61 +534,61 @@ ${carbon.kernel.version} - - org.wso2.carbon.governance - org.wso2.carbon.governance.api - ${carbon.governance.version} - - - org.apache.juddi.wso2 - juddi - - - org.wso2.carbon.registry - org.wso2.carbon.registry.common - - - org.wso2.carbon - org.wso2.carbon.registry.core - - - org.wso2.carbon.registry - org.wso2.carbon.registry.admin.api - - - org.wso2.carbon.registry - org.wso2.carbon.registry.indexing - - - com.ibm.icu - icu4j - - - org.eclipse.equinox - org.eclipse.equinox.registry - - - eclipse - validateutility - - - org.apache.ws.commons.axiom - axiom-api - - - org.apache.ws.commons.axiom - axiom-impl - - - org.wso2.carbon.registry - org.wso2.carbon.registry.extensions - - - javax.servlet - servlet-api - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.wso2.carbon @@ -682,11 +663,11 @@ gson ${google.gson.version} - - com.google.android.gcm - gcm-server - ${gcm.server.version} - + + + + + org.json.wso2 json @@ -739,6 +720,19 @@ cxf-rt-transports-http ${cxf.version} + + org.apache.cxf.wso2 + cxf-bundle + ${cxf-bundle.version} + test + + + org.apache.cxf + cxf-bundle-jaxrs + provided + ${cxf-bundle-package.version} + + javax.ws.rs jsr311-api @@ -771,58 +765,58 @@ jackson-jaxrs ${jackson.version} - - org.wso2.orbit.com.fasterxml.jackson.core - jackson-annotations - ${jackson-annotations.version} - + + + + + - - org.apache.cxf - cxf-rt-bindings-soap - ${cxf.version} - - - org.apache.cxf - cxf-rt-bindings-http - ${cxf.bindings.version} - - - org.apache.ws.security - wss4j - ${wss4j.security.version} - - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf.version} - - - org.apache.cxf - cxf-rt-ws-security - ${cxf.version} - - - org.apache.wss4j - wss4j-ws-security-common - ${wss4j.security.common.version} - - - org.apache.ws.commons.axiom.wso2 - axiom - ${axiom-api.version} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - commons-io - commons-io - ${commons-io.version} - + + + + + commons-io.wso2 commons-io @@ -838,94 +832,124 @@ spring-web ${spring-web.version} - - org.springframework.ws - spring-ws-security - ${spring-ws-security.version} - - - org.springframework - spring-context - ${spring-web.version} - - - com.sun.xml.ws - jaxws-rt - ${jaxws-rt.version} - - - com.sun.xml.messaging.saaj - saaj-impl - ${saaj-impl.version} - - - org.wso2.orbit.org.bouncycastle - bcpkix-jdk15on - ${bcpkix-jdk15on.version} - - - org.wso2.orbit.org.bouncycastle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.bouncycastle.wso2 bcprov-jdk15on ${bcprov-jdk15on.version} - org.codehaus.plexus - plexus-utils - ${plexus-utils.version} - - - com.madgag.spongycastle - pkix - ${spongycastle.version} - - - com.madgag.spongycastle - prov - ${spongycastle.version} - - - com.madgag.spongycastle - core - ${spongycastle.version} - - - joda-time - joda-time - ${joda-time.version} + org.bouncycastle.wso2 + bcpkix-jdk15on + ${bcpkix-jdk15on.version} - - org.apache.felix - org.apache.felix.scr - ${apache-felix.version} - + com.google.code.jscep.wso2 + jscep + ${jscep.version} + + + commons-logging + commons-logging + ${common-logging.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.googlecode.json-simple.wso2 json-simple ${json-simple.version} - - com.googlecode.plist - dd-plist - ${googlecode.plist.version} - + + + + + org.wso2.carbon.identity.inbound.auth.oauth2 org.wso2.carbon.identity.oauth.stub ${identity.inbound.auth.oauth.version} provided - - org.wso2.carbon.identity.inbound.auth.oauth2 - org.wso2.carbon.identity.oauth - ${identity.inbound.auth.oauth.version} - provided - - - org.wso2.carbon.identity.carbon.auth.jwt - org.wso2.carbon.identity.authenticator.signedjwt - ${identity.carbon.auth.jwt.version} - + + + + + + + + + + + org.apache.httpcomponents.wso2 httpcore @@ -951,11 +975,11 @@ commons-configuration ${commons-configuration.version} - - org.wso2.carbon.commons - org.wso2.carbon.user.mgt - ${carbon.commons.version} - + + + + + com.jayway.jsonpath json-path @@ -994,21 +1018,21 @@ ${hibernate-validator.version} - - org.wso2.andes.wso2 - andes - ${andes.version} - - - io.entgra.device.mgt.plugins - org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization - ${io.entgra.device.mgt.plugins.version} - - - io.entgra.device.mgt.plugins - org.wso2.carbon.andes.extensions.device.mgt.api - ${io.entgra.device.mgt.plugins.version} - + + + + + + + + + + + + + + + @@ -1052,11 +1076,11 @@ feign-slf4j ${io.github.openfeign.version} - - org.wso2.carbon.messaging - org.wso2.carbon.andes.mqtt.stub - ${carbon.andes.mqtt.version} - + + + + + @@ -1126,11 +1150,11 @@ apk ${android.agent.version} - - com.google.apis - google-api-services-androidenterprise - v1-rev214-1.25.0 - + + + + + @@ -1160,6 +1184,11 @@ ${commons-lang-wso2} provided + + org.apache.httpcomponents + httpasyncclient + 4.1 + @@ -1176,68 +1205,70 @@ 4.0.0 - 1.8 - 1.8 + 17 + 17 - 4.6.2 - [4.5.0, 5.0.0) - 4.4.9 + 4.8.1 + + 1.11.2 5.1.2 - [1.6.1.wso2v11, 1.7.0) - 1.6.1.wso2v11 - 1.1.0-wso2v10 + + 1.6.1-wso2v85 + - 1.3 + - 4.8.2 - 4.3.1 - 6.8 + 4.13.1 + + 7.4.0 - 3.6.100.v20120522-1841 - 3.9.1.v20140110-1610 + 3.6.200.v20130402-1505 + 3.8.1.v20120830-144521 + 3.3.100.v20120522-1822 - 1.4.199.wso2v1 - 1.2.140.wso2v3 - 7.0.85.wso2v1 + 2.1.210.wso2v1 + + 7.0.34.wso2v2 - 3.3.6 + 3.5.5 2.5.11 - 1.9.0 + 2.6.1.wso2v2 + 1.9.13 1.1.1 - 4.6.21 + 4.9.2 - 4.7.15 + - 5.18.187 - 6.4.111 - [5.2.0, 7.0.0) - 5.1.5 + + 6.9.6 + + - 4.9.10 + - 4.7.39 + - 4.8.21 + - 9.0.174 + 3.0.4.wso2v1 @@ -1248,91 +1279,94 @@ 8.1.3.v20120416 - 1.5.10 + 1.6.9 - 5.2.34 - [5.2.0,6.0.0) + 5.3.5 + - 1.51.0.0 - 1.49 - 2.0.0 - 3.0.21 - 2.8.5 - 1.0.2 + + + + + 2.9.1 + 2.4.0.wso2v1 - 2.4 - 1.0.8 - 1.8 - 2.2 + + + + 2.4 3.1.0.wso2v2 1.4.0.wso2v1 - 1.7 + 1.9 6.0 - 1.2.11.wso2v10 + 1.2.17 - 5.1.13.RELEASE - 3.0.8.RELEASE - 2.2.8 - 1.3.18 - 1.52.0.wso2v2 - 1.52.0.wso2v1 - 3.0.21 - 2.3 - 1.6.17 - 2.0.0 + 5.3.23 + + + + 1.49.0.wso2v2 + 1.49.0.wso2v2 + 2.0.2.wso2v2 + 1.2 + 1.7.13 + + + + 3.0.0.wso2v1 - (3.0.0, 4.0.0] + [2.0.0,4.0.0) 0.9.1 1.1.wso2v1 3.2.2 - 1.8 + 1.10 - 7.0.85.wso2v1 + 7.0.93.wso2v1 4.3.1.wso2v2 [4.3.1, 5.0.0) - 4.3.3.wso2v1 + 4.4.16.wso2v1 4.5.6 - 7.3.0.wso2v1 - [7.3, 8) + 7.9.0.wso2v1 + 1.5.6.wso2v1 - 7.0.85 - 1.0 + 9.0.24 + 1.1 2.0.1 - github-scm + 2.5 5.0.2.Final - [0.0.0,1.0.0) + - 3.2.34 - 3.2.50 - 2.9.8.wso2v1 - 3.2.34 + + + + - 9.3.1 - [1.1.0, 2.0.0) + 11.0 + 1.7 - 3.2.6 - 1.7.2 + 3.2.9 + true @@ -1341,11 +1375,11 @@ 1.0b3 1.4.0.wso2v1 3.12.1.GA - 1.7.0 + 1.7.4 - 3.8.1 + 4.6.0 1.13.0 - 9.3.1 + 11.0 2.7.18 @@ -1390,11 +1424,11 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.1 + 3.8.1 UTF-8 - 1.8 - 1.8 + 17 + 17 @@ -1409,26 +1443,36 @@ org.apache.maven.plugins maven-deploy-plugin + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + + org.codehaus.mojo + exec-maven-plugin + 1.4.0 + - - org.apache.felix - maven-scr-plugin - 1.7.2 - - - generate-scr-scrdescriptor - - scr - - - - + + + + + + + + + + + + + org.apache.felix maven-bundle-plugin - 3.5.0 + 5.1.1 true NONE @@ -1454,7 +1498,7 @@ org.apache.maven.plugins maven-assembly-plugin - 2.2-beta-2 + 2.5.5 org.apache.maven.plugins @@ -1469,7 +1513,7 @@ org.apache.maven.plugins maven-war-plugin - 2.2 + 3.3.1 org.apache.maven.plugins