community
/
device-mgt-plugins
10
0
Fork 39
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

updated to work with carbon kernel 4.6.2

Browse Source
merge-requests/182/head
Amalka Subasinghe 4 years ago
parent 72aca888bc
commit ac26f7b6b8
13 changed files with 74 additions and 104 deletions
Show Stats Download Patch File Download Diff File

4
components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml
Unescape View File

@ -66,8 +66,8 @@
!org.wso2.carbon.device.mgt.input.adapter.extension.internal, !org.wso2.carbon.device.mgt.input.adapter.extension.internal,
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
com.jayway.jsonpath, com.jayway.jsonpath,
org.apache.commons.logging, org.apache.commons.logging,
org.json.simple, org.json.simple,

4
components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml
Unescape View File

@ -140,8 +140,8 @@
com.nimbusds.jose, com.nimbusds.jose,
com.nimbusds.jose.crypto, com.nimbusds.jose.crypto,
com.nimbusds.jwt, com.nimbusds.jwt,
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
javax.servlet, javax.servlet,
javax.servlet.http, javax.servlet.http,
org.osgi.service.http, org.osgi.service.http,

5
components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
Unescape View File

@ -142,9 +142,8 @@
org.apache.commons.codec.binary, org.apache.commons.codec.binary,
org.apache.commons.logging, org.apache.commons.logging,
org.apache.http.entity, org.apache.http.entity,
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.osgi.service.http,
org.wso2.carbon.context, org.wso2.carbon.context,
org.wso2.carbon.core, org.wso2.carbon.core,
org.wso2.carbon.device.mgt.input.adapter.extension, org.wso2.carbon.device.mgt.input.adapter.extension,

4
components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml
Unescape View File

@ -111,8 +111,8 @@
!javax.xml.namespace, !javax.xml.namespace,
javax.xml.namespace; version=0.0.0, javax.xml.namespace; version=0.0.0,
org.apache.commons.logging, org.apache.commons.logging,
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context, org.wso2.carbon.context,
org.wso2.carbon.databridge.commons, org.wso2.carbon.databridge.commons,
org.wso2.carbon.databridge.core, org.wso2.carbon.databridge.core,

5
components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml
Unescape View File

@ -118,9 +118,8 @@
org.wso2.carbon.base, org.wso2.carbon.base,
org.wso2.carbon.core.util, org.wso2.carbon.core.util,
org.apache.commons.logging, org.apache.commons.logging,
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.osgi.service.http,
org.wso2.carbon.context, org.wso2.carbon.context,
org.wso2.carbon.core, org.wso2.carbon.core,
org.wso2.carbon.device.mgt.input.adapter.extension, org.wso2.carbon.device.mgt.input.adapter.extension,

4
components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml
Unescape View File

@ -118,8 +118,8 @@
org.eclipse.paho.client.mqttv3.persist, org.eclipse.paho.client.mqttv3.persist,
org.json.simple, org.json.simple,
org.json.simple.parser, org.json.simple.parser,
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context, org.wso2.carbon.context,
org.apache.commons.codec.binary, org.apache.commons.codec.binary,
org.apache.http.client.entity, org.apache.http.client.entity,

4
components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml
Unescape View File

@ -127,8 +127,8 @@
org.eclipse.paho.client.mqttv3.persist, org.eclipse.paho.client.mqttv3.persist,
org.json.simple, org.json.simple,
org.json.simple.parser, org.json.simple.parser,
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context, org.wso2.carbon.context,
org.apache.commons.codec.binary, org.apache.commons.codec.binary,
org.apache.http.client.entity, org.apache.http.client.entity,

4
components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml
Unescape View File

@ -154,8 +154,8 @@
com.google.gson, com.google.gson,
javax.websocket, javax.websocket,
org.apache.commons.logging, org.apache.commons.logging,
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context, org.wso2.carbon.context,
org.wso2.carbon.databridge.commons, org.wso2.carbon.databridge.commons,
org.wso2.carbon.event.stream.core, org.wso2.carbon.event.stream.core,

4
components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml
Unescape View File

@ -96,8 +96,8 @@
org.wso2.carbon.event.output.adapter.core.*, org.wso2.carbon.event.output.adapter.core.*,
org.jivesoftware.smack.*, org.jivesoftware.smack.*,
org.apache.commons.logging, org.apache.commons.logging,
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.wso2.carbon.context org.wso2.carbon.context
</Import-Package> </Import-Package>
</instructions> </instructions>

2
components/extensions/pom.xml
Unescape View File

@ -34,7 +34,7 @@
<modules> <modules>
<module>cdmf-transport-adapters</module> <module>cdmf-transport-adapters</module>
<module>mb-extensions</module> <!--<module>mb-extensions</module>-->
<module>pull-notification-listeners</module> <module>pull-notification-listeners</module>
</modules> </modules>

4
components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml
Unescape View File

@ -86,8 +86,8 @@
org.wso2.carbon.device.mgt.mqtt.notification.listener.* org.wso2.carbon.device.mgt.mqtt.notification.listener.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.osgi.framework, org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.component, org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.apache.commons.logging, org.apache.commons.logging,
org.wso2.carbon.device.mgt.common.*, org.wso2.carbon.device.mgt.common.*,
org.wso2.carbon.device.mgt.core.service, org.wso2.carbon.device.mgt.core.service,

4
features/extensions-feature/pom.xml
Unescape View File

@ -35,8 +35,8 @@
<modules> <modules>
<module>org.wso2.carbon.device.mgt.adapter.feature</module> <module>org.wso2.carbon.device.mgt.adapter.feature</module>
<module>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature</module> <!--<module>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature</module>-->
<module>org.wso2.carbon.andes.extensions.device.mgt.api.feature</module> <!--<module>org.wso2.carbon.andes.extensions.device.mgt.api.feature</module>-->
<module>org.wso2.carbon.device.mgt.notification.listener.feature</module> <module>org.wso2.carbon.device.mgt.notification.listener.feature</module>
</modules> </modules>

98
pom.xml
Unescape View File

@ -36,13 +36,13 @@
<modules> <modules>
<module>components/extensions</module> <module>components/extensions</module>
<module>components/mobile-plugins</module> <!--<module>components/mobile-plugins</module>-->
<!-- <module>components/device-types</module>--> <!--<module>components/device-types</module>-->
<module>components/analytics</module> <!--<module>components/analytics</module>-->
<module>components/test-coverage</module> <!--<module>components/test-coverage</module>-->
<module>features/analytics-feature</module> <!--<module>features/analytics-feature</module>-->
<module>features/mobile-plugins-feature</module> <!--<module>features/mobile-plugins-feature</module>-->
<!-- <module>features/device-types-feature</module>--> <!--<module>features/device-types-feature</module>-->
<module>features/extensions-feature</module> <module>features/extensions-feature</module>
</modules> </modules>
@ -102,7 +102,7 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version> <version>${carbon.logging.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.log4j.wso2</groupId> <groupId>org.apache.log4j.wso2</groupId>
@ -300,22 +300,6 @@
<artifactId>org.wso2.carbon.certificate.mgt.core</artifactId> <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
<version>${carbon.devicemgt.version}</version> <version>${carbon.devicemgt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher</artifactId>
<version>${carbon.devicemgt.version}</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.dynamic.client.registration</artifactId>
<version>${carbon.devicemgt.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId> <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
@ -331,16 +315,6 @@
<artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId> <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
<version>${carbon.devicemgt.version}</version> <version>${carbon.devicemgt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.event-processing</groupId>
<artifactId>org.wso2.carbon.siddhi.geo.event.fuser</artifactId>
<version>${carbon.event.processing.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.event-processing</groupId>
<artifactId>org.wso2.carbon.siddhi.geo.event.notifier</artifactId>
<version>${carbon.event.processing.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.apimgt.annotations</artifactId> <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
@ -403,11 +377,6 @@
<artifactId>org.wso2.carbon.databridge.core</artifactId> <artifactId>org.wso2.carbon.databridge.core</artifactId>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.analytics</groupId>
<artifactId>org.wso2.carbon.analytics.api</artifactId>
<version>${carbon.analytics.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.stream.core</artifactId> <artifactId>org.wso2.carbon.event.stream.core</artifactId>
@ -1155,7 +1124,7 @@
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.devicemgt.version>4.1.16-SNAPSHOT</carbon.devicemgt.version> <carbon.devicemgt.version>4.1.16-SNAPSHOT</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range> <carbon.devicemgt.version.range>[4.1.15, 5.0.0)</carbon.devicemgt.version.range>
<!-- Carbon Device Management Plugins --> <!-- Carbon Device Management Plugins -->
<carbon.devicemgt.plugins.version>5.0.16-SNAPSHOT</carbon.devicemgt.plugins.version> <carbon.devicemgt.plugins.version>5.0.16-SNAPSHOT</carbon.devicemgt.plugins.version>
@ -1168,10 +1137,11 @@
<wso2.maven.compiler.target>1.8</wso2.maven.compiler.target> <wso2.maven.compiler.target>1.8</wso2.maven.compiler.target>
<!--Carbon kernel versions--> <!--Carbon kernel versions-->
<carbon.kernel.version>4.4.26</carbon.kernel.version> <carbon.kernel.version>4.6.2</carbon.kernel.version>
<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range> <carbon.kernel.version.range>[4.5.0, 5.0.0)</carbon.kernel.version.range>
<carbon.logging.version>4.4.9</carbon.logging.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
<!-- Axis2 --> <!-- Axis2 -->
<axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range> <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
@ -1188,7 +1158,7 @@
<!--Eclipse Osgi--> <!--Eclipse Osgi-->
<eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version> <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
<eclipse.osgi.version>3.9.1.v20130814-1242</eclipse.osgi.version> <eclipse.osgi.version>3.9.1.v20140110-1610</eclipse.osgi.version>
<!--Orbit versions--> <!--Orbit versions-->
<orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version> <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
@ -1196,7 +1166,7 @@
<orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version> <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
<!-- CXF version --> <!-- CXF version -->
<cxf.version>2.6.1</cxf.version> <cxf.version>3.3.6</cxf.version>
<cxf.bindings.version>2.5.11</cxf.bindings.version> <cxf.bindings.version>2.5.11</cxf.bindings.version>
<jackson.version>1.9.0</jackson.version> <jackson.version>1.9.0</jackson.version>
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
@ -1208,22 +1178,22 @@
<carbon.deployment.version>4.7.15</carbon.deployment.version> <carbon.deployment.version>4.7.15</carbon.deployment.version>
<!-- Carbon Identity --> <!-- Carbon Identity -->
<carbon.identity.framework.version>5.11.148</carbon.identity.framework.version> <carbon.identity.framework.version>5.18.187</carbon.identity.framework.version>
<identity.inbound.auth.oauth.version>5.6.63</identity.inbound.auth.oauth.version> <identity.inbound.auth.oauth.version>6.4.111</identity.inbound.auth.oauth.version>
<carbon.identity.version.range>[5.2.0, 6.0.0)</carbon.identity.version.range> <carbon.identity.version.range>[5.2.0, 7.0.0)</carbon.identity.version.range>
<identity.carbon.auth.jwt.version>5.1.2</identity.carbon.auth.jwt.version> <identity.carbon.auth.jwt.version>5.1.5</identity.carbon.auth.jwt.version>
<!-- Carbon Multi-tenancy --> <!-- Carbon Multi-tenancy -->
<carbon.multitenancy.version>4.6.11</carbon.multitenancy.version> <carbon.multitenancy.version>4.9.10</carbon.multitenancy.version>
<!-- Carbon Registry --> <!-- Carbon Registry -->
<carbon.registry.version>4.6.28</carbon.registry.version> <carbon.registry.version>4.7.39</carbon.registry.version>
<!-- Carbon Governance --> <!-- Carbon Governance -->
<carbon.governance.version>4.7.23</carbon.governance.version> <carbon.governance.version>4.8.21</carbon.governance.version>
<!-- Carbon API Management --> <!-- Carbon API Management -->
<carbon.api.mgt.version>6.2.201</carbon.api.mgt.version> <carbon.api.mgt.version>9.0.174</carbon.api.mgt.version>
<!-- XMPP/MQTT Version --> <!-- XMPP/MQTT Version -->
<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version> <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
@ -1234,21 +1204,18 @@
<jetty.version>8.1.3.v20120416</jetty.version> <jetty.version>8.1.3.v20120416</jetty.version>
<!-- Swagger --> <!-- Swagger -->
<swagger.version>1.5.8</swagger.version> <swagger.version>1.5.10</swagger.version>
<!-- Carbon Analytics --> <!-- Carbon Analytics -->
<carbon.analytics.common.version>5.1.37</carbon.analytics.common.version> <carbon.analytics.common.version>5.2.34</carbon.analytics.common.version>
<carbon.analytics.common.version.range>[5.1.3,6.0.0)</carbon.analytics.common.version.range> <carbon.analytics.common.version.range>[5.2.0,6.0.0)</carbon.analytics.common.version.range>
<carbon.analytics.version>1.3.25</carbon.analytics.version>
<carbon.analytics.version.range>[1.3.0,2.0.0)</carbon.analytics.version.range>
<carbon.event.processing.version>2.1.23</carbon.event.processing.version>
<!-- Third Party Dependencies--> <!-- Third Party Dependencies-->
<spongycastle.version>1.51.0.0</spongycastle.version> <spongycastle.version>1.51.0.0</spongycastle.version>
<bouncycastle.version>1.49</bouncycastle.version> <bouncycastle.version>1.49</bouncycastle.version>
<apache.wss4j.version>2.0.0</apache.wss4j.version> <apache.wss4j.version>2.0.0</apache.wss4j.version>
<codehaus.plexus.version>3.0.21</codehaus.plexus.version> <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
<google.gson.version>2.3.1</google.gson.version> <google.gson.version>2.8.5</google.gson.version>
<gcm.server.version>1.0.2</gcm.server.version> <gcm.server.version>1.0.2</gcm.server.version>
<commons-io-wso2.version>2.4.0.wso2v1</commons-io-wso2.version> <commons-io-wso2.version>2.4.0.wso2v1</commons-io-wso2.version>
<commons-io.version>2.4</commons-io.version> <commons-io.version>2.4</commons-io.version>
@ -1265,8 +1232,8 @@
<axiom-api.version>1.2.11.wso2v10</axiom-api.version> <axiom-api.version>1.2.11.wso2v10</axiom-api.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<spring-web.version>3.0.5.RELEASE</spring-web.version> <spring-web.version>5.1.13.RELEASE</spring-web.version>
<spring-ws-security.version>2.1.0.RELEASE</spring-ws-security.version> <spring-ws-security.version>3.0.8.RELEASE</spring-ws-security.version>
<jaxws-rt.version>2.2.8</jaxws-rt.version> <jaxws-rt.version>2.2.8</jaxws-rt.version>
<saaj-impl.version>1.3.18</saaj-impl.version> <saaj-impl.version>1.3.18</saaj-impl.version>
<bcpkix-jdk15on.version>1.52.0.wso2v2</bcpkix-jdk15on.version> <bcpkix-jdk15on.version>1.52.0.wso2v2</bcpkix-jdk15on.version>
@ -1313,7 +1280,7 @@
<!-- MB Features --> <!-- MB Features -->
<carbon.messaging.version>3.2.34</carbon.messaging.version> <carbon.messaging.version>3.2.34</carbon.messaging.version>
<andes.version>3.2.50</andes.version> <andes.version>3.2.50</andes.version>
<jackson-annotations.version>2.6.1.wso2v1</jackson-annotations.version> <jackson-annotations.version>2.9.8.wso2v1</jackson-annotations.version>
<carbon.andes.mqtt.version>3.2.34</carbon.andes.mqtt.version> <carbon.andes.mqtt.version>3.2.34</carbon.andes.mqtt.version>
<!--Feign Version--> <!--Feign Version-->
@ -1335,6 +1302,11 @@
<squareup.okhttp3.version>3.8.1</squareup.okhttp3.version> <squareup.okhttp3.version>3.8.1</squareup.okhttp3.version>
<okio.version>1.13.0</okio.version> <okio.version>1.13.0</okio.version>
<github.openfeign.version>9.3.1</github.openfeign.version> <github.openfeign.version>9.3.1</github.openfeign.version>
<cxf-bundle-package.version>2.7.18</cxf-bundle-package.version>
<imp.package.version.osgi.framework>[1.6.0, 2.0.0)</imp.package.version.osgi.framework>
<imp.package.version.osgi.service>[1.2.0,1.3.0)</imp.package.version.osgi.service>
</properties> </properties>
<scm> <scm>

Write Preview
Loading…
Cancel
Save