updated versions for apim 420 and jdk 17

apim420
Amalka Subasinghe 2 years ago
parent 121ec7951f
commit 785a6e51a4

@ -36,7 +36,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<phase>process-resources</phase> <phase>process-resources</phase>
@ -53,7 +52,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.5.5</version>
<configuration> <configuration>
<finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName> <finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>

@ -36,23 +36,22 @@
<module>iot-analytics</module> <module>iot-analytics</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <executions>-->
<executions> <!-- <execution>-->
<execution> <!-- <id>generate-scr-scrdescriptor</id>-->
<id>generate-scr-scrdescriptor</id> <!-- <goals>-->
<goals> <!-- <goal>scr</goal>-->
<goal>scr</goal> <!-- </goals>-->
</goals> <!-- </execution>-->
</execution> <!-- </executions>-->
</executions> <!-- </plugin>-->
</plugin> <!-- </plugins>-->
</plugins> <!-- </pluginManagement>-->
</pluginManagement> <!-- </build>-->
</build>
</project> </project>

@ -36,24 +36,24 @@
<module>virtual-fire-alarm-plugin</module> <module>virtual-fire-alarm-plugin</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

@ -41,8 +41,11 @@
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<source>${wso2.maven.compiler.source}</source> <source>${wso2.maven.compiler.source}</source>
<target>${wso2.maven.compiler.target}</target> <target>${wso2.maven.compiler.target}</target>
<compilerArgs>
<arg>--add-exports</arg><arg>java.base/sun.security.x509=ALL-UNNAMED</arg>
</compilerArgs>
</configuration> </configuration>
<version>2.3.2</version>
</plugin> </plugin>
<plugin> <plugin>
@ -84,7 +87,6 @@
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency> </dependency>
@ -92,45 +94,38 @@
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
</dependency> </dependency>
<!--Dependency on MQTT Client Library--> <!--Dependency on MQTT Client Library-->
<dependency> <dependency>
<groupId>org.eclipse.paho</groupId> <groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId> <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>${paho.mqtt.version}</version>
</dependency> </dependency>
<!--Dependencies on XMPP Client Library--> <!--Dependencies on XMPP Client Library-->
<dependency> <dependency>
<groupId>org.igniterealtime.smack.wso2</groupId> <groupId>org.igniterealtime.smack.wso2</groupId>
<artifactId>smack</artifactId> <artifactId>smack</artifactId>
<version>${smack.wso2.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.igniterealtime.smack.wso2</groupId> <groupId>org.igniterealtime.smack.wso2</groupId>
<artifactId>smackx</artifactId> <artifactId>smackx</artifactId>
<version>${smackx.wso2.version}</version>
</dependency> </dependency>
<!--Dependency on BouncyCastle Library for SCEP--> <!--Dependency on BouncyCastle Library for SCEP-->
<dependency> <dependency>
<groupId>org.bouncycastle.wso2</groupId> <groupId>org.bouncycastle.wso2</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>${bcprov.wso2.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle.wso2</groupId> <groupId>org.bouncycastle.wso2</groupId>
<artifactId>bcpkix-jdk15on</artifactId> <artifactId>bcpkix-jdk15on</artifactId>
<version>${bcpkix.wso2.version}</version>
</dependency> </dependency>
<!--Dependency on WSO2 JSCEP Orbit--> <!--Dependency on WSO2 JSCEP Orbit-->
<dependency> <dependency>
<groupId>com.google.code.jscep.wso2</groupId> <groupId>com.google.code.jscep.wso2</groupId>
<artifactId>jscep</artifactId> <artifactId>jscep</artifactId>
<version>${jscep.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -141,31 +136,26 @@
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
<version>${common-logging.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io.wso2</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${commons.io}</version>
</dependency> </dependency>
<!--Dependency on SLF4J - required by BouncyCastle--> <!--Dependency on SLF4J - required by BouncyCastle-->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -176,62 +166,61 @@
<dependency> <dependency>
<groupId>commons-configuration</groupId> <groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId> <artifactId>commons-configuration</artifactId>
<version>1.10</version>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <!-- <repositories>-->
<repository> <!-- <repository>-->
<id>wso2-nexus</id> <!-- <id>wso2-nexus</id>-->
<name>WSO2 internal Repository</name> <!-- <name>WSO2 internal Repository</name>-->
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url> <!-- <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>-->
<releases> <!-- <releases>-->
<enabled>true</enabled> <!-- <enabled>true</enabled>-->
<updatePolicy>daily</updatePolicy> <!-- <updatePolicy>daily</updatePolicy>-->
<checksumPolicy>ignore</checksumPolicy> <!-- <checksumPolicy>ignore</checksumPolicy>-->
</releases> <!-- </releases>-->
</repository> <!-- </repository>-->
<repository> <!-- <repository>-->
<id>wso2-maven2-repository</id> <!-- <id>wso2-maven2-repository</id>-->
<url>http://dist.wso2.org/maven2</url> <!-- <url>http://dist.wso2.org/maven2</url>-->
</repository> <!-- </repository>-->
</repositories> <!-- </repositories>-->
<properties> <!-- <properties>-->
<!-- Java Version Compatibility --> <!-- &lt;!&ndash; Java Version Compatibility &ndash;&gt;-->
<wso2.maven.compiler.source>1.7</wso2.maven.compiler.source> <!-- <wso2.maven.compiler.source>17</wso2.maven.compiler.source>-->
<wso2.maven.compiler.target>1.7</wso2.maven.compiler.target> <!-- <wso2.maven.compiler.target>17</wso2.maven.compiler.target>-->
<!-- Jetty Server Version --> <!-- &lt;!&ndash; Jetty Server Version &ndash;&gt;-->
<jetty.version>8.1.3.v20120416</jetty.version> <!-- <jetty.version>8.1.3.v20120416</jetty.version>-->
<!-- MQTT Paho Version --> <!-- &lt;!&ndash; MQTT Paho Version &ndash;&gt;-->
<paho.mqtt.version>1.0.2</paho.mqtt.version> <!-- <paho.mqtt.version>1.0.2</paho.mqtt.version>-->
<!-- Jivesoftware XMPP Version --> <!-- &lt;!&ndash; Jivesoftware XMPP Version &ndash;&gt;-->
<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version> <!-- <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>-->
<smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version> <!-- <smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>-->
<!-- BouncyCastle Version --> <!-- &lt;!&ndash; BouncyCastle Version &ndash;&gt;-->
<bcprov.wso2.version>1.49.wso2v1</bcprov.wso2.version> <!-- <bcprov.wso2.version>1.49.wso2v1</bcprov.wso2.version>-->
<bcpkix.wso2.version>1.49.wso2v1</bcpkix.wso2.version> <!-- <bcpkix.wso2.version>1.49.wso2v1</bcpkix.wso2.version>-->
<!-- WSO2 JSCEP Orbit Version --> <!-- &lt;!&ndash; WSO2 JSCEP Orbit Version &ndash;&gt;-->
<jscep.version>2.0.2.wso2v2</jscep.version> <!-- <jscep.version>2.0.2.wso2v2</jscep.version>-->
<!-- Commons Libraries --> <!-- &lt;!&ndash; Commons Libraries &ndash;&gt;-->
<log4j.version>1.2.17</log4j.version> <!-- <log4j.version>1.2.17</log4j.version>-->
<common-logging.version>1.2</common-logging.version> <!-- <common-logging.version>1.2</common-logging.version>-->
<commons.io>2.4</commons.io> <!-- <commons.io>2.4</commons.io>-->
<commons-codec.version>1.7</commons-codec.version> <!-- <commons-codec.version>1.7</commons-codec.version>-->
<commons-lang.version>2.6</commons-lang.version> <!-- <commons-lang.version>2.6</commons-lang.version>-->
<!-- SLF4J Version --> <!-- &lt;!&ndash; SLF4J Version &ndash;&gt;-->
<slf4j.version>1.7.13</slf4j.version> <!-- <slf4j.version>1.7.13</slf4j.version>-->
</properties> <!-- </properties>-->
</project> </project>

@ -32,9 +32,7 @@
<description>WSO2 Carbon - Virtual FireAlarm Service Management API Implementation</description> <description>WSO2 Carbon - Virtual FireAlarm Service Management API Implementation</description>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<properties>
<cxf-bundle-package.version>2.7.18</cxf-bundle-package.version>
</properties>
<dependencies> <dependencies>
<!-- CDM --> <!-- CDM -->
@ -96,7 +94,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId> <artifactId>httpasyncclient</artifactId>
<version>4.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -233,17 +230,14 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf.wso2</groupId>
<artifactId>cxf-bundle</artifactId> <artifactId>cxf-bundle</artifactId>
<version>3.0.0-milestone2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId> <artifactId>cxf-bundle-jaxrs</artifactId>
<scope>provided</scope> <scope>provided</scope>
<version>${cxf-bundle-package.version}</version>
</dependency> </dependency>
<dependency> <dependency>

@ -37,23 +37,23 @@
<module>io.entgra.device.mgt.plugins.virtualfirealarm.api</module> <module>io.entgra.device.mgt.plugins.virtualfirealarm.api</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

@ -36,14 +36,14 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-descriptor</id> <!-- <id>generate-scr-descriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -107,8 +107,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.json-simple.wso2</groupId> <groupId>com.googlecode.json-simple.wso2</groupId>

@ -37,8 +37,8 @@
<artifactId>org.wso2.carbon.event.input.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -103,14 +103,14 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-descriptor</id> <!-- <id>generate-scr-descriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

@ -41,8 +41,8 @@
<artifactId>org.wso2.carbon.event.input.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -95,14 +95,14 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-descriptor</id> <!-- <id>generate-scr-descriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

@ -44,8 +44,8 @@
<artifactId>org.wso2.carbon.event.input.adapter.wso2event</artifactId> <artifactId>org.wso2.carbon.event.input.adapter.wso2event</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -75,14 +75,14 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-descriptor</id> <!-- <id>generate-scr-descriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

@ -37,8 +37,8 @@
<artifactId>org.wso2.carbon.event.input.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -79,14 +79,14 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-descriptor</id> <!-- <id>generate-scr-descriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

@ -39,8 +39,8 @@
<artifactId>org.wso2.carbon.event.output.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents.wso2</groupId> <groupId>org.apache.httpcomponents.wso2</groupId>
@ -69,14 +69,14 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-descriptor</id> <!-- <id>generate-scr-descriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>

@ -50,8 +50,8 @@
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents.wso2</groupId> <groupId>org.apache.httpcomponents.wso2</groupId>
@ -83,14 +83,14 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-descriptor</id> <!-- <id>generate-scr-descriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>

@ -40,8 +40,8 @@
<artifactId>org.wso2.carbon.event.output.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -106,14 +106,14 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-descriptor</id> <!-- <id>generate-scr-descriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

@ -43,8 +43,8 @@
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.igniterealtime.smack.wso2</groupId> <groupId>org.igniterealtime.smack.wso2</groupId>
@ -60,14 +60,14 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-descriptor</id> <!-- <id>generate-scr-descriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> </plugin>
<plugin> <plugin>

@ -45,23 +45,23 @@
<module>output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</module> <module>output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

@ -87,7 +87,6 @@
<plugin> <plugin>
<groupId>org.xolstice.maven.plugins</groupId> <groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration> <configuration>
<protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact> <protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId> <pluginId>grpc-java</pluginId>

@ -52,14 +52,12 @@
<extension> <extension>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId> <artifactId>wagon-ssh</artifactId>
<version>2.1</version>
</extension> </extension>
</extensions> </extensions>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration> <configuration>
<source>${wso2.maven.compiler.source}</source> <source>${wso2.maven.compiler.source}</source>
<target>${wso2.maven.compiler.target}</target> <target>${wso2.maven.compiler.target}</target>
@ -68,20 +66,18 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId> <artifactId>maven-scr-plugin</artifactId>
<version>1.7.2</version> <!-- <executions>-->
<executions> <!-- <execution>-->
<execution> <!-- <id>generate-scr-scrdescriptor</id>-->
<id>generate-scr-scrdescriptor</id> <!-- <goals>-->
<goals> <!-- <goal>scr</goal>-->
<goal>scr</goal> <!-- </goals>-->
</goals> <!-- </execution>-->
</execution> <!-- </executions>-->
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>

@ -38,8 +38,8 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.7</source> <source>17</source>
<target>1.7</target> <target>17</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -87,7 +87,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -117,7 +116,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
@ -169,8 +167,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

@ -37,23 +37,23 @@
<module>org.wso2.carbon.andes.extensions.device.mgt.api</module> <module>org.wso2.carbon.andes.extensions.device.mgt.api</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

@ -40,23 +40,23 @@
<module>siddhi-extensions</module> <module>siddhi-extensions</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>${maven.scr.version}</version> <!-- <version>${maven.scr.version}</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

@ -36,23 +36,23 @@
<module>io.entgra.device.mgt.plugins.mqtt.notification.listener</module> <module>io.entgra.device.mgt.plugins.mqtt.notification.listener</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

@ -37,23 +37,23 @@
<module>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</module> <module>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

@ -36,14 +36,12 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>17</source>
<target>1.8</target> <target>17</target>
</configuration> </configuration>
<version>2.3.2</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<configuration> <configuration>
<packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes> <packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes>
<warName>api#device-mgt#android#v1.0</warName> <warName>api#device-mgt#android#v1.0</warName>
@ -99,7 +97,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -156,7 +153,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
@ -205,8 +201,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

@ -105,7 +105,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.5.5</version>
<configuration> <configuration>
<finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName> <finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>

@ -46,7 +46,6 @@
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>1.4.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<instructions> <instructions>
@ -128,8 +127,8 @@
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>pax-logging-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>

@ -39,23 +39,22 @@
<module>io.entgra.device.mgt.plugins.mobile.android.ui</module> <module>io.entgra.device.mgt.plugins.mobile.android.ui</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <executions>-->
<executions> <!-- <execution>-->
<execution> <!-- <id>generate-scr-scrdescriptor</id>-->
<id>generate-scr-scrdescriptor</id> <!-- <goals>-->
<goals> <!-- <goal>scr</goal>-->
<goal>scr</goal> <!-- </goals>-->
</goals> <!-- </execution>-->
</execution> <!-- </executions>-->
</executions> <!-- </plugin>-->
</plugin> <!-- </plugins>-->
</plugins> <!-- </pluginManagement>-->
</pluginManagement> <!-- </build>-->
</build>
</project> </project>

@ -36,23 +36,23 @@
<module>android-plugin</module> <module>android-plugin</module>
</modules> </modules>
<build> <!-- <build>-->
<pluginManagement> <!-- <pluginManagement>-->
<plugins> <!-- <plugins>-->
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</pluginManagement> <!-- </pluginManagement>-->
</build> <!-- </build>-->
</project> </project>

@ -49,7 +49,6 @@
<dependency> <dependency>
<groupId>org.wso2.orbit.com.h2database</groupId> <groupId>org.wso2.orbit.com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>${orbit.h2.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

@ -68,7 +68,6 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions> <executions>
<execution> <execution>
<id>copy-resources</id> <id>copy-resources</id>

@ -31,7 +31,7 @@
<parent> <parent>
<groupId>org.wso2</groupId> <groupId>org.wso2</groupId>
<artifactId>wso2</artifactId> <artifactId>wso2</artifactId>
<version>1</version> <version>1.3</version>
</parent> </parent>
<modules> <modules>
@ -97,25 +97,6 @@
<artifactId>org.wso2.carbon.base</artifactId> <artifactId>org.wso2.carbon.base</artifactId>
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.logging.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.log4j.wso2</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.bootstrap</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>
@ -324,17 +305,17 @@
<artifactId>org.wso2.carbon.databridge.commons</artifactId> <artifactId>org.wso2.carbon.databridge.commons</artifactId>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.analytics-common</groupId> <!-- <groupId>org.wso2.carbon.analytics-common</groupId>-->
<artifactId>org.wso2.carbon.databridge.agent</artifactId> <!-- <artifactId>org.wso2.carbon.databridge.agent</artifactId>-->
<version>${carbon.analytics.common.version}</version> <!-- <version>${carbon.analytics.common.version}</version>-->
<exclusions> <!-- <exclusions>-->
<exclusion> <!-- <exclusion>-->
<groupId>commons-codec.wso2</groupId> <!-- <groupId>commons-codec.wso2</groupId>-->
<artifactId>commons-codec</artifactId> <!-- <artifactId>commons-codec</artifactId>-->
</exclusion> <!-- </exclusion>-->
</exclusions> <!-- </exclusions>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon.analytics-common</groupId> <groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.event.output.adapter.core</artifactId> <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
@ -526,7 +507,7 @@
<dependency> <dependency>
<groupId>org.eclipse.osgi</groupId> <groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId> <artifactId>org.eclipse.osgi.services</artifactId>
<version>3.3.100.v20120522-1822</version> <version>${eclipse.equinox.services.version}</version>
</dependency> </dependency>
<!--Orbit dependencies--> <!--Orbit dependencies-->
@ -553,61 +534,61 @@
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.governance</groupId> <!-- <groupId>org.wso2.carbon.governance</groupId>-->
<artifactId>org.wso2.carbon.governance.api</artifactId> <!-- <artifactId>org.wso2.carbon.governance.api</artifactId>-->
<version>${carbon.governance.version}</version> <!-- <version>${carbon.governance.version}</version>-->
<exclusions> <!-- <exclusions>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.apache.juddi.wso2</groupId> <!-- <groupId>org.apache.juddi.wso2</groupId>-->
<artifactId>juddi</artifactId> <!-- <artifactId>juddi</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.wso2.carbon.registry</groupId> <!-- <groupId>org.wso2.carbon.registry</groupId>-->
<artifactId>org.wso2.carbon.registry.common</artifactId> <!-- <artifactId>org.wso2.carbon.registry.common</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.wso2.carbon</groupId> <!-- <groupId>org.wso2.carbon</groupId>-->
<artifactId>org.wso2.carbon.registry.core</artifactId> <!-- <artifactId>org.wso2.carbon.registry.core</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.wso2.carbon.registry</groupId> <!-- <groupId>org.wso2.carbon.registry</groupId>-->
<artifactId>org.wso2.carbon.registry.admin.api</artifactId> <!-- <artifactId>org.wso2.carbon.registry.admin.api</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.wso2.carbon.registry</groupId> <!-- <groupId>org.wso2.carbon.registry</groupId>-->
<artifactId>org.wso2.carbon.registry.indexing</artifactId> <!-- <artifactId>org.wso2.carbon.registry.indexing</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>com.ibm.icu</groupId> <!-- <groupId>com.ibm.icu</groupId>-->
<artifactId>icu4j</artifactId> <!-- <artifactId>icu4j</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.eclipse.equinox</groupId> <!-- <groupId>org.eclipse.equinox</groupId>-->
<artifactId>org.eclipse.equinox.registry</artifactId> <!-- <artifactId>org.eclipse.equinox.registry</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>eclipse</groupId> <!-- <groupId>eclipse</groupId>-->
<artifactId>validateutility</artifactId> <!-- <artifactId>validateutility</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.apache.ws.commons.axiom</groupId> <!-- <groupId>org.apache.ws.commons.axiom</groupId>-->
<artifactId>axiom-api</artifactId> <!-- <artifactId>axiom-api</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.apache.ws.commons.axiom</groupId> <!-- <groupId>org.apache.ws.commons.axiom</groupId>-->
<artifactId>axiom-impl</artifactId> <!-- <artifactId>axiom-impl</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.wso2.carbon.registry</groupId> <!-- <groupId>org.wso2.carbon.registry</groupId>-->
<artifactId>org.wso2.carbon.registry.extensions</artifactId> <!-- <artifactId>org.wso2.carbon.registry.extensions</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>javax.servlet</groupId> <!-- <groupId>javax.servlet</groupId>-->
<artifactId>servlet-api</artifactId> <!-- <artifactId>servlet-api</artifactId>-->
</exclusion> <!-- </exclusion>-->
</exclusions> <!-- </exclusions>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -682,11 +663,11 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${google.gson.version}</version> <version>${google.gson.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.google.android.gcm</groupId> <!-- <groupId>com.google.android.gcm</groupId>-->
<artifactId>gcm-server</artifactId> <!-- <artifactId>gcm-server</artifactId>-->
<version>${gcm.server.version}</version> <!-- <version>${gcm.server.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.json.wso2</groupId> <groupId>org.json.wso2</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
@ -739,6 +720,19 @@
<artifactId>cxf-rt-transports-http</artifactId> <artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.cxf.wso2</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${cxf-bundle.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
<scope>provided</scope>
<version>${cxf-bundle-package.version}</version>
</dependency>
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId> <artifactId>jsr311-api</artifactId>
@ -771,58 +765,58 @@
<artifactId>jackson-jaxrs</artifactId> <artifactId>jackson-jaxrs</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.wso2.orbit.com.fasterxml.jackson.core</groupId> <!-- <groupId>org.wso2.orbit.com.fasterxml.jackson.core</groupId>-->
<artifactId>jackson-annotations</artifactId> <!-- <artifactId>jackson-annotations</artifactId>-->
<version>${jackson-annotations.version}</version> <!-- <version>${jackson-annotations.version}</version>-->
</dependency> <!-- </dependency>-->
<!--Windows Jax-RS dependencies--> <!--Windows Jax-RS dependencies-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.cxf</groupId> <!-- <groupId>org.apache.cxf</groupId>-->
<artifactId>cxf-rt-bindings-soap</artifactId> <!-- <artifactId>cxf-rt-bindings-soap</artifactId>-->
<version>${cxf.version}</version> <!-- <version>${cxf.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.cxf</groupId> <!-- <groupId>org.apache.cxf</groupId>-->
<artifactId>cxf-rt-bindings-http</artifactId> <!-- <artifactId>cxf-rt-bindings-http</artifactId>-->
<version>${cxf.bindings.version}</version> <!-- <version>${cxf.bindings.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.ws.security</groupId> <!-- <groupId>org.apache.ws.security</groupId>-->
<artifactId>wss4j</artifactId> <!-- <artifactId>wss4j</artifactId>-->
<version>${wss4j.security.version}</version> <!-- <version>${wss4j.security.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.cxf</groupId> <!-- <groupId>org.apache.cxf</groupId>-->
<artifactId>cxf-rt-rs-extension-providers</artifactId> <!-- <artifactId>cxf-rt-rs-extension-providers</artifactId>-->
<version>${cxf.version}</version> <!-- <version>${cxf.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.cxf</groupId> <!-- <groupId>org.apache.cxf</groupId>-->
<artifactId>cxf-rt-ws-security</artifactId> <!-- <artifactId>cxf-rt-ws-security</artifactId>-->
<version>${cxf.version}</version> <!-- <version>${cxf.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.wss4j</groupId> <!-- <groupId>org.apache.wss4j</groupId>-->
<artifactId>wss4j-ws-security-common</artifactId> <!-- <artifactId>wss4j-ws-security-common</artifactId>-->
<version>${wss4j.security.common.version}</version> <!-- <version>${wss4j.security.common.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.ws.commons.axiom.wso2</groupId> <!-- <groupId>org.apache.ws.commons.axiom.wso2</groupId>-->
<artifactId>axiom</artifactId> <!-- <artifactId>axiom</artifactId>-->
<version>${axiom-api.version}</version> <!-- <version>${axiom-api.version}</version>-->
</dependency> <!-- </dependency>-->
<!--dependency> <!--dependency>
<groupId>org.apache.ws.commons.axiom</groupId> <groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId> <artifactId>axiom-impl</artifactId>
<version>${axiom-api.version}</version> <version>${axiom-api.version}</version>
</dependency--> </dependency-->
<dependency> <!-- <dependency>-->
<groupId>commons-io</groupId> <!-- <groupId>commons-io</groupId>-->
<artifactId>commons-io</artifactId> <!-- <artifactId>commons-io</artifactId>-->
<version>${commons-io.version}</version> <!-- <version>${commons-io.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>commons-io.wso2</groupId> <groupId>commons-io.wso2</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
@ -838,94 +832,124 @@
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>${spring-web.version}</version> <version>${spring-web.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.ws</groupId>-->
<!-- <artifactId>spring-ws-security</artifactId>-->
<!-- <version>${spring-ws-security.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework</groupId>-->
<!-- <artifactId>spring-context</artifactId>-->
<!-- <version>${spring-web.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.sun.xml.ws</groupId>-->
<!-- <artifactId>jaxws-rt</artifactId>-->
<!-- <version>${jaxws-rt.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.sun.xml.messaging.saaj</groupId>-->
<!-- <artifactId>saaj-impl</artifactId>-->
<!-- <version>${saaj-impl.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.wso2.orbit.org.bouncycastle</groupId>-->
<!-- <artifactId>bcpkix-jdk15on</artifactId>-->
<!-- <version>${bcpkix-jdk15on.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.wso2.orbit.org.bouncycastle</groupId>-->
<!-- <artifactId>bcprov-jdk15on</artifactId>-->
<!-- <version>${bcprov-jdk15on.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.springframework.ws</groupId> <groupId>org.bouncycastle.wso2</groupId>
<artifactId>spring-ws-security</artifactId>
<version>${spring-ws-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-web.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>${jaxws-rt.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>${saaj-impl.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.orbit.org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>${bcpkix-jdk15on.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.orbit.org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>${bcprov-jdk15on.version}</version> <version>${bcprov-jdk15on.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.bouncycastle.wso2</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>bcpkix-jdk15on</artifactId>
<version>${plexus-utils.version}</version> <version>${bcpkix-jdk15on.version}</version>
</dependency>
<dependency>
<groupId>com.madgag.spongycastle</groupId>
<artifactId>pkix</artifactId>
<version>${spongycastle.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.madgag.spongycastle</groupId> <groupId>com.google.code.jscep.wso2</groupId>
<artifactId>prov</artifactId> <artifactId>jscep</artifactId>
<version>${spongycastle.version}</version> <version>${jscep.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.madgag.spongycastle</groupId> <groupId>commons-logging</groupId>
<artifactId>core</artifactId> <artifactId>commons-logging</artifactId>
<version>${spongycastle.version}</version> <version>${common-logging.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>org.slf4j</groupId>
<artifactId>joda-time</artifactId> <artifactId>slf4j-api</artifactId>
<version>${joda-time.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.felix</groupId> <groupId>org.slf4j</groupId>
<artifactId>org.apache.felix.scr</artifactId> <artifactId>slf4j-simple</artifactId>
<version>${apache-felix.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.codehaus.plexus</groupId>-->
<!-- <artifactId>plexus-utils</artifactId>-->
<!-- <version>${plexus-utils.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.madgag.spongycastle</groupId>-->
<!-- <artifactId>pkix</artifactId>-->
<!-- <version>${spongycastle.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.madgag.spongycastle</groupId>-->
<!-- <artifactId>prov</artifactId>-->
<!-- <version>${spongycastle.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.madgag.spongycastle</groupId>-->
<!-- <artifactId>core</artifactId>-->
<!-- <version>${spongycastle.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>joda-time</groupId>-->
<!-- <artifactId>joda-time</artifactId>-->
<!-- <version>${joda-time.version}</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.apache.felix</groupId>-->
<!-- <artifactId>org.apache.felix.scr</artifactId>-->
<!-- <version>${apache-felix.version}</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.googlecode.json-simple.wso2</groupId> <groupId>com.googlecode.json-simple.wso2</groupId>
<artifactId>json-simple</artifactId> <artifactId>json-simple</artifactId>
<version>${json-simple.version}</version> <version>${json-simple.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.googlecode.plist</groupId> <!-- <groupId>com.googlecode.plist</groupId>-->
<artifactId>dd-plist</artifactId> <!-- <artifactId>dd-plist</artifactId>-->
<version>${googlecode.plist.version}</version> <!-- <version>${googlecode.plist.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId> <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId> <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
<version>${identity.inbound.auth.oauth.version}</version> <version>${identity.inbound.auth.oauth.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId> <!-- <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>-->
<artifactId>org.wso2.carbon.identity.oauth</artifactId> <!-- <artifactId>org.wso2.carbon.identity.oauth</artifactId>-->
<version>${identity.inbound.auth.oauth.version}</version> <!-- <version>${identity.inbound.auth.oauth.version}</version>-->
<scope>provided</scope> <!-- <scope>provided</scope>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.identity.carbon.auth.jwt</groupId> <!-- <groupId>org.wso2.carbon.identity.carbon.auth.jwt</groupId>-->
<artifactId>org.wso2.carbon.identity.authenticator.signedjwt</artifactId> <!-- <artifactId>org.wso2.carbon.identity.authenticator.signedjwt</artifactId>-->
<version>${identity.carbon.auth.jwt.version}</version> <!-- <version>${identity.carbon.auth.jwt.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.apache.httpcomponents.wso2</groupId> <groupId>org.apache.httpcomponents.wso2</groupId>
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>
@ -951,11 +975,11 @@
<artifactId>commons-configuration</artifactId> <artifactId>commons-configuration</artifactId>
<version>${commons-configuration.version}</version> <version>${commons-configuration.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.commons</groupId> <!-- <groupId>org.wso2.carbon.commons</groupId>-->
<artifactId>org.wso2.carbon.user.mgt</artifactId> <!-- <artifactId>org.wso2.carbon.user.mgt</artifactId>-->
<version>${carbon.commons.version}</version> <!-- <version>${carbon.commons.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>com.jayway.jsonpath</groupId> <groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId> <artifactId>json-path</artifactId>
@ -994,21 +1018,21 @@
<version>${hibernate-validator.version}</version> <version>${hibernate-validator.version}</version>
</dependency> </dependency>
<!--MB feature --> <!--MB feature -->
<dependency> <!-- <dependency>-->
<groupId>org.wso2.andes.wso2</groupId> <!-- <groupId>org.wso2.andes.wso2</groupId>-->
<artifactId>andes</artifactId> <!-- <artifactId>andes</artifactId>-->
<version>${andes.version}</version> <!-- <version>${andes.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>io.entgra.device.mgt.plugins</groupId> <!-- <groupId>io.entgra.device.mgt.plugins</groupId>-->
<artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</artifactId> <!-- <artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</artifactId>-->
<version>${io.entgra.device.mgt.plugins.version}</version> <!-- <version>${io.entgra.device.mgt.plugins.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>io.entgra.device.mgt.plugins</groupId> <!-- <groupId>io.entgra.device.mgt.plugins</groupId>-->
<artifactId>org.wso2.carbon.andes.extensions.device.mgt.api</artifactId> <!-- <artifactId>org.wso2.carbon.andes.extensions.device.mgt.api</artifactId>-->
<version>${io.entgra.device.mgt.plugins.version}</version> <!-- <version>${io.entgra.device.mgt.plugins.version}</version>-->
</dependency> <!-- </dependency>-->
<!--EMQX Extensions --> <!--EMQX Extensions -->
<dependency> <dependency>
@ -1052,11 +1076,11 @@
<artifactId>feign-slf4j</artifactId> <artifactId>feign-slf4j</artifactId>
<version>${io.github.openfeign.version}</version> <version>${io.github.openfeign.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.wso2.carbon.messaging</groupId> <!-- <groupId>org.wso2.carbon.messaging</groupId>-->
<artifactId>org.wso2.carbon.andes.mqtt.stub</artifactId> <!-- <artifactId>org.wso2.carbon.andes.mqtt.stub</artifactId>-->
<version>${carbon.andes.mqtt.version}</version> <!-- <version>${carbon.andes.mqtt.version}</version>-->
</dependency> <!-- </dependency>-->
<!-- dependencies for siddhi extension --> <!-- dependencies for siddhi extension -->
<dependency> <dependency>
@ -1126,11 +1150,11 @@
<type>apk</type> <type>apk</type>
<version>${android.agent.version}</version> <version>${android.agent.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.google.apis</groupId> <!-- <groupId>com.google.apis</groupId>-->
<artifactId>google-api-services-androidenterprise</artifactId> <!-- <artifactId>google-api-services-androidenterprise</artifactId>-->
<version>v1-rev214-1.25.0</version> <!-- <version>v1-rev214-1.25.0</version>-->
</dependency> <!-- </dependency>-->
<!--Dependencies for EMQX--> <!--Dependencies for EMQX-->
<dependency> <dependency>
@ -1160,6 +1184,11 @@
<version>${commons-lang-wso2}</version> <version>${commons-lang-wso2}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
<version>4.1</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -1176,68 +1205,70 @@
<android.agent.version>4.0.0</android.agent.version> <android.agent.version>4.0.0</android.agent.version>
<!-- Java Version Compatibility --> <!-- Java Version Compatibility -->
<wso2.maven.compiler.source>1.8</wso2.maven.compiler.source> <wso2.maven.compiler.source>17</wso2.maven.compiler.source>
<wso2.maven.compiler.target>1.8</wso2.maven.compiler.target> <wso2.maven.compiler.target>17</wso2.maven.compiler.target>
<!--Carbon kernel versions--> <!--Carbon kernel versions-->
<carbon.kernel.version>4.6.2</carbon.kernel.version> <carbon.kernel.version>4.8.1</carbon.kernel.version>
<carbon.kernel.version.range>[4.5.0, 5.0.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.logging.version>4.4.9</carbon.logging.version>-->
<pax.logging.api.version>1.11.2</pax.logging.api.version> <pax.logging.api.version>1.11.2</pax.logging.api.version>
<carbon.p2.plugin.version>5.1.2</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>-->
<axis2.orbit.version>1.6.1.wso2v11</axis2.orbit.version> <axis2.orbit.version>1.6.1-wso2v85</axis2.orbit.version>
<axis2-transports.version>1.1.0-wso2v10</axis2-transports.version> <!-- <axis2-transports.version>1.1.0-wso2v10</axis2-transports.version>-->
<!--Maven build number plugin--> <!--Maven build number plugin-->
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version> <!-- <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>-->
<!--Testing --> <!--Testing -->
<junit.version>4.8.2</junit.version> <junit.version>4.13.1</junit.version>
<test.framework.version>4.3.1</test.framework.version> <!-- <test.framework.version>4.3.1</test.framework.version>-->
<testng.version>6.8</testng.version> <testng.version>7.4.0</testng.version>
<!--Eclipse Osgi--> <!--Eclipse Osgi-->
<eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version> <eclipse.equinox.common.version>3.6.200.v20130402-1505</eclipse.equinox.common.version>
<eclipse.osgi.version>3.9.1.v20140110-1610</eclipse.osgi.version> <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
<eclipse.equinox.services.version>3.3.100.v20120522-1822</eclipse.equinox.services.version>
<!--Orbit versions--> <!--Orbit versions-->
<orbit.h2.version>1.4.199.wso2v1</orbit.h2.version> <orbit.h2.version>2.1.210.wso2v1</orbit.h2.version>
<orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version> <!-- <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>-->
<orbit.tomcat.version>7.0.85.wso2v1</orbit.tomcat.version> <!-- <orbit.tomcat.version>7.0.85.wso2v1</orbit.tomcat.version>-->
<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>3.3.6</cxf.version> <cxf.version>3.5.5</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> <cxf-bundle.version>2.6.1.wso2v2</cxf-bundle.version>
<jackson.version>1.9.13</jackson.version>
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Commons --> <!-- Carbon Commons -->
<carbon.commons.version>4.6.21</carbon.commons.version> <carbon.commons.version>4.9.2</carbon.commons.version>
<!-- Carbon Deployment --> <!-- Carbon Deployment -->
<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.18.187</carbon.identity.framework.version> <!-- <carbon.identity.framework.version>5.24.8</carbon.identity.framework.version>-->
<identity.inbound.auth.oauth.version>6.4.111</identity.inbound.auth.oauth.version> <identity.inbound.auth.oauth.version>6.9.6</identity.inbound.auth.oauth.version>
<carbon.identity.version.range>[5.2.0, 7.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.5</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.9.10</carbon.multitenancy.version> <!-- <carbon.multitenancy.version>4.9.20</carbon.multitenancy.version>-->
<!-- Carbon Registry --> <!-- Carbon Registry -->
<carbon.registry.version>4.7.39</carbon.registry.version> <!-- <carbon.registry.version>4.8.13</carbon.registry.version>-->
<!-- Carbon Governance --> <!-- Carbon Governance -->
<carbon.governance.version>4.8.21</carbon.governance.version> <!-- <carbon.governance.version>4.8.30</carbon.governance.version>-->
<!-- Carbon API Management --> <!-- Carbon API Management -->
<carbon.api.mgt.version>9.0.174</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>
@ -1248,91 +1279,94 @@
<jetty.version>8.1.3.v20120416</jetty.version> <jetty.version>8.1.3.v20120416</jetty.version>
<!-- Swagger --> <!-- Swagger -->
<swagger.version>1.5.10</swagger.version> <swagger.version>1.6.9</swagger.version>
<!-- Carbon Analytics --> <!-- Carbon Analytics -->
<carbon.analytics.common.version>5.2.34</carbon.analytics.common.version> <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
<carbon.analytics.common.version.range>[5.2.0,6.0.0)</carbon.analytics.common.version.range> <!-- <carbon.analytics.common.version.range>[5.3.0,6.0.0)</carbon.analytics.common.version.range>-->
<!-- 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.8.5</google.gson.version> <google.gson.version>2.9.1</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.0.wso2v1</commons-io.version>-->
<apache-felix.version>1.0.8</apache-felix.version> <!-- <apache-felix.version>1.0.8</apache-felix.version>-->
<googlecode.plist.version>1.8</googlecode.plist.version> <!-- <googlecode.plist.version>1.8</googlecode.plist.version>-->
<commons.lang.version>2.2</commons.lang.version> <commons.lang.version>2.4</commons.lang.version>
<orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient> <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
<commons-codec.version.wso2>1.4.0.wso2v1</commons-codec.version.wso2> <commons-codec.version.wso2>1.4.0.wso2v1</commons-codec.version.wso2>
<commons-codec.version>1.7</commons-codec.version> <commons-codec.version>1.9</commons-codec.version>
<javaee-web-api.version>6.0</javaee-web-api.version> <javaee-web-api.version>6.0</javaee-web-api.version>
<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>5.1.13.RELEASE</spring-web.version> <spring-web.version>5.3.23</spring-web.version>
<spring-ws-security.version>3.0.8.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.49.0.wso2v2</bcpkix-jdk15on.version>
<bcprov-jdk15on.version>1.52.0.wso2v1</bcprov-jdk15on.version> <bcprov-jdk15on.version>1.49.0.wso2v2</bcprov-jdk15on.version>
<plexus-utils.version>3.0.21</plexus-utils.version> <jscep.version>2.0.2.wso2v2</jscep.version>
<joda-time.version>2.3</joda-time.version> <common-logging.version>1.2</common-logging.version>
<wss4j.security.version>1.6.17</wss4j.security.version> <slf4j.version>1.7.13</slf4j.version>
<wss4j.security.common.version>2.0.0</wss4j.security.common.version> <!-- <plexus-utils.version>3.0.21</plexus-utils.version>-->
<!-- <joda-time.version>2.3</joda-time.version>-->
<!-- <wss4j.security.version>1.6.17</wss4j.security.version>-->
<!-- <wss4j.security.common.version>2.0.0</wss4j.security.common.version>-->
<commons-json.version>3.0.0.wso2v1</commons-json.version> <commons-json.version>3.0.0.wso2v1</commons-json.version>
<commons-json.version.range>(3.0.0, 4.0.0]</commons-json.version.range> <!-- <commons-json.version.range>(3.0.0, 4.0.0]</commons-json.version.range>-->
<orbit.version.json.range>[2.0.0,4.0.0)</orbit.version.json.range> <orbit.version.json.range>[2.0.0,4.0.0)</orbit.version.json.range>
<json.path.version>0.9.1</json.path.version> <json.path.version>0.9.1</json.path.version>
<json-simple.version>1.1.wso2v1</json-simple.version> <json-simple.version>1.1.wso2v1</json-simple.version>
<commons-collections.version>3.2.2</commons-collections.version> <commons-collections.version>3.2.2</commons-collections.version>
<commons-configuration.version>1.8</commons-configuration.version> <commons-configuration.version>1.10</commons-configuration.version>
<orbit.version.tomcat-servlet-api>7.0.85.wso2v1</orbit.version.tomcat-servlet-api> <orbit.version.tomcat-servlet-api>7.0.93.wso2v1</orbit.version.tomcat-servlet-api>
<!--http client version--> <!--http client version-->
<httpclient.version>4.3.1.wso2v2</httpclient.version> <httpclient.version>4.3.1.wso2v2</httpclient.version>
<httpclient.version.range>[4.3.1, 5.0.0)</httpclient.version.range> <httpclient.version.range>[4.3.1, 5.0.0)</httpclient.version.range>
<httpcore.version>4.3.3.wso2v1</httpcore.version> <httpcore.version>4.4.16.wso2v1</httpcore.version>
<apache.http.client.version>4.5.6</apache.http.client.version> <apache.http.client.version>4.5.6</apache.http.client.version>
<!-- Nimbus Jose--> <!-- Nimbus Jose-->
<nimbus.orbit.version>7.3.0.wso2v1</nimbus.orbit.version> <nimbus.orbit.version>7.9.0.wso2v1</nimbus.orbit.version>
<nimbus.orbit.version.range>[7.3, 8)</nimbus.orbit.version.range> <!-- <nimbus.orbit.version.range>[7.3, 8)</nimbus.orbit.version.range>-->
<commons.pool.wso2.version>1.5.6.wso2v1</commons.pool.wso2.version> <commons.pool.wso2.version>1.5.6.wso2v1</commons.pool.wso2.version>
<!--websocket related lib versions--> <!--websocket related lib versions-->
<tomcat.websocket.version>7.0.85</tomcat.websocket.version> <tomcat.websocket.version>9.0.24</tomcat.websocket.version>
<javax.websocket.version>1.0</javax.websocket.version> <javax.websocket.version>1.1</javax.websocket.version>
<javax.version>2.0.1</javax.version> <javax.version>2.0.1</javax.version>
<!-- Release plugin ID for github--> <!-- Release plugin ID for github-->
<project.scm.id>github-scm</project.scm.id> <!-- <project.scm.id>github-scm</project.scm.id>-->
<servlet-api.version>2.5</servlet-api.version> <servlet-api.version>2.5</servlet-api.version>
<hibernate-validator.version>5.0.2.Final</hibernate-validator.version> <hibernate-validator.version>5.0.2.Final</hibernate-validator.version>
<javax.xml.parsers.import.pkg.version>[0.0.0,1.0.0)</javax.xml.parsers.import.pkg.version> <!-- <javax.xml.parsers.import.pkg.version>[0.0.0,1.0.0)</javax.xml.parsers.import.pkg.version>-->
<!-- 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.9.8.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-->
<io.github.openfeign.version>9.3.1</io.github.openfeign.version> <io.github.openfeign.version>11.0</io.github.openfeign.version>
<javax.ws.rs.jsr311-api.version>[1.1.0, 2.0.0)</javax.ws.rs.jsr311-api.version> <!-- <javax.ws.rs.jsr311-api.version>[1.1.0, 2.0.0)</javax.ws.rs.jsr311-api.version>-->
<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version> <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
<siddhi.version>3.2.6</siddhi.version> <siddhi.version>3.2.9</siddhi.version>
<maven.scr.version>1.7.2</maven.scr.version> <!-- <maven.scr.version>1.7.2</maven.scr.version>-->
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<!-- jacoco plugin version --> <!-- jacoco plugin version -->
@ -1341,11 +1375,11 @@
<ant.contrib.version>1.0b3</ant.contrib.version> <ant.contrib.version>1.0b3</ant.contrib.version>
<commons.dbcp.version>1.4.0.wso2v1</commons.dbcp.version> <commons.dbcp.version>1.4.0.wso2v1</commons.dbcp.version>
<javassist.version>3.12.1.GA</javassist.version> <javassist.version>3.12.1.GA</javassist.version>
<powermock.version>1.7.0</powermock.version> <powermock.version>1.7.4</powermock.version>
<squareup.okhttp3.version>3.8.1</squareup.okhttp3.version> <squareup.okhttp3.version>4.6.0</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>11.0</github.openfeign.version>
<cxf-bundle-package.version>2.7.18</cxf-bundle-package.version> <cxf-bundle-package.version>2.7.18</cxf-bundle-package.version>
@ -1390,11 +1424,11 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.1</version> <version>3.8.1</version>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<source>1.8</source> <source>17</source>
<target>1.8</target> <target>17</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -1409,26 +1443,36 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <!-- <plugin>-->
<groupId>org.apache.felix</groupId> <!-- <groupId>org.apache.felix</groupId>-->
<artifactId>maven-scr-plugin</artifactId> <!-- <artifactId>maven-scr-plugin</artifactId>-->
<version>1.7.2</version> <!-- <version>1.7.2</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<id>generate-scr-scrdescriptor</id> <!-- <id>generate-scr-scrdescriptor</id>-->
<goals> <!-- <goals>-->
<goal>scr</goal> <!-- <goal>scr</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>3.5.0</version> <version>5.1.1</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<obrRepository>NONE</obrRepository> <obrRepository>NONE</obrRepository>
@ -1454,7 +1498,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version> <version>2.5.5</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1469,7 +1513,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.2</version> <version>3.3.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

Loading…
Cancel
Save