Merge branch 'master' into integration-tests

remotes/1731415108363211838/master
Charitha Goonetilleke 2 years ago
commit 01a2b6b0a4

@ -2,7 +2,7 @@
<a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/> <a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
[![pipeline status](https://gitlab.com/entgra/community-product/badges/master/pipeline.svg)](https://gitlab.com/entgra/community-product/commits/master) [![pipeline status](https://builder.entgra.net/buildStatus/icon?job=community-product)](https://repository.entgra.net/community/community-product/commits/master)
Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner. Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner.

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>io.entgra.product.community</groupId> <groupId>io.entgra.product.community</groupId>
<artifactId>distribution</artifactId> <artifactId>distribution</artifactId>
<version>5.1.3-SNAPSHOT</version> <version>5.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>io.entgra.product.community</groupId> <groupId>io.entgra.product.community</groupId>
<artifactId>distribution</artifactId> <artifactId>distribution</artifactId>
<version>5.1.3-SNAPSHOT</version> <version>5.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>io.entgra.product.community</groupId> <groupId>io.entgra.product.community</groupId>
<artifactId>product-parent</artifactId> <artifactId>product-parent</artifactId>
<version>5.1.3-SNAPSHOT</version> <version>5.2.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>io.entgra.product.community</groupId> <groupId>io.entgra.product.community</groupId>
<artifactId>product-parent</artifactId> <artifactId>product-parent</artifactId>
<version>5.1.3-SNAPSHOT</version> <version>5.2.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -84,7 +84,7 @@
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>update-dbscripts</id> <id>update-dbscripts-1</id>
<phase>process-resources</phase> <phase>process-resources</phase>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@ -93,17 +93,34 @@
<target name="replace dbscripts to avoid tenant creation issue "> <target name="replace dbscripts to avoid tenant creation issue ">
<replace file="target/${wso2am}/dbscripts/db2.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," /> <replace file="target/${wso2am}/dbscripts/db2.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," />
<replace file="target/${wso2am}/dbscripts/h2.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," /> <replace file="target/${wso2am}/dbscripts/h2.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," />
<replace file="target/${wso2am}/dbscripts/informix.sql" token="REG_VALUE LVARCHAR(1000)," value="REG_VALUE LVARCHAR(10000)," />
<replace file="target/${wso2am}/dbscripts/mssql.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," /> <replace file="target/${wso2am}/dbscripts/mssql.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," />
<replace file="target/${wso2am}/dbscripts/mysql.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," /> <replace file="target/${wso2am}/dbscripts/mysql.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," />
<replace file="target/${wso2am}/dbscripts/mysql_cluster.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," /> <replace file="target/${wso2am}/dbscripts/mysql_cluster.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," />
<replace file="target/${wso2am}/dbscripts/oracle.sql" token="REG_VALUE VARCHAR2(1000)," value="REG_VALUE VARCHAR2(10000)," /> <replace file="target/${wso2am}/dbscripts/oracle.sql" token="REG_VALUE VARCHAR2(1000)," value="REG_VALUE VARCHAR2(10000)," />
<replace file="target/${wso2am}/dbscripts/oracle.sql" token="REG_VALUE VARCHAR2(1000)," value="REG_VALUE VARCHAR2(10000)," />
<replace file="target/${wso2am}/dbscripts/oracle_rac.sql" token="REG_VALUE VARCHAR2(1000)," value="REG_VALUE VARCHAR2(10000)," /> <replace file="target/${wso2am}/dbscripts/oracle_rac.sql" token="REG_VALUE VARCHAR2(1000)," value="REG_VALUE VARCHAR2(10000)," />
<replace file="target/${wso2am}/dbscripts/postgresql.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," /> <replace file="target/${wso2am}/dbscripts/postgresql.sql" token="REG_VALUE VARCHAR(1000)," value="REG_VALUE VARCHAR(10000)," />
</target> </target>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>update-dbscripts-2</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target name="increase IDN_OAUTH2_ACCESS_TOKEN_SCOPE -&gt; TOKEN_SCOPE column size">
<replace file="target/${wso2am}/dbscripts/apimgt/db2.sql" token="TOKEN_SCOPE VARCHAR (60) NOT NULL," value="TOKEN_SCOPE VARCHAR (255) NOT NULL," />
<replace file="target/${wso2am}/dbscripts/apimgt/h2.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (255)," />
<replace file="target/${wso2am}/dbscripts/apimgt/mssql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (255)," />
<replace file="target/${wso2am}/dbscripts/apimgt/mysql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (255)," />
<replace file="target/${wso2am}/dbscripts/apimgt/mysql_cluster.sql" token="TOKEN_SCOPE VARCHAR(60)," value="TOKEN_SCOPE VARCHAR(255)," />
<replace file="target/${wso2am}/dbscripts/apimgt/oracle.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (255)," />
<replace file="target/${wso2am}/dbscripts/apimgt/oracle_rac.sql" token="TOKEN_SCOPE VARCHAR2 (60)," value="TOKEN_SCOPE VARCHAR2 (60)," />
<replace file="target/${wso2am}/dbscripts/apimgt/postgresql.sql" token="TOKEN_SCOPE VARCHAR (60)," value="TOKEN_SCOPE VARCHAR (60)," />
</target>
</configuration>
</execution>
<execution> <execution>
<!--Alter shared h2 db --> <!--Alter shared h2 db -->
<id>alter-shared-h2-db</id> <id>alter-shared-h2-db</id>
@ -323,6 +340,29 @@
org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.stateengine.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:io.entgra.device.mgt.extensions.stateengine.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- Task Mgt Feature-->
<featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.task.mgt.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- End of Task Mgt Feature-->
<!-- Notification Logger Feature-->
<featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.notification.logger.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- End of Notification Logger Feature-->
<!-- APIM analytics extension feature-->
<featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.device.mgt.core.apimgt.analytics.extension.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- End of APIM analytics extension feature-->
<!-- Tenant Management Feature -->
<featureArtifactDef>
org.wso2.carbon.devicemgt:io.entgra.tenant.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!-- End of Tenant Management Feature -->
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -482,6 +522,30 @@
<id>io.entgra.device.mgt.extensions.stateengine.feature.group</id> <id>io.entgra.device.mgt.extensions.stateengine.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!--Task mgt-->
<feature>
<id>io.entgra.task.mgt.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!--Notification Logger-->
<feature>
<id>io.entgra.notification.logger.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!--APIM Analytics extension-->
<feature>
<id>io.entgra.device.mgt.core.apimgt.analytics.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!-- Tenant Management -->
<feature>
<id>io.entgra.tenant.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

@ -92,6 +92,10 @@
<source>src/core/conf/input-event-adapters.xml</source> <source>src/core/conf/input-event-adapters.xml</source>
<outputDirectory>${entgra-iot-core}/repository/conf/</outputDirectory> <outputDirectory>${entgra-iot-core}/repository/conf/</outputDirectory>
</file> </file>
<file>
<source>src/core/conf/output-event-adapters.xml.j2</source>
<outputDirectory>${entgra-iot-core}/repository/resources/conf/templates/repository/conf</outputDirectory>
</file>
<file> <file>
<source>src/core/keystores/wso2carbon.jks</source> <source>src/core/keystores/wso2carbon.jks</source>
<outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory> <outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory>
@ -100,6 +104,10 @@
<source>src/core/keystores/client-truststore.jks</source> <source>src/core/keystores/client-truststore.jks</source>
<outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory> <outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory>
</file> </file>
<file>
<source>src/core/samples/device-plugins-deployer.xml</source>
<outputDirectory>${entgra-iot-core}/samples/</outputDirectory>
</file>
</files> </files>
<dependencySets> <dependencySets>

@ -104,6 +104,9 @@ enable = false
config_endpoint = "https://localhost:8080/auth/v1" config_endpoint = "https://localhost:8080/auth/v1"
auth_token = "" auth_token = ""
[web_app.listener]
class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "org.wso2.carbon.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"]
[apim.key_manager] [apim.key_manager]
#service_url = "https://localhost:${mgt.transport.https.port}/services/" #service_url = "https://localhost:${mgt.transport.https.port}/services/"
#username = "$ref{super_admin.username}" #username = "$ref{super_admin.username}"
@ -277,3 +280,6 @@ grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTo
[oauth.token_renewal] [oauth.token_renewal]
renew_refresh_token=false renew_refresh_token=false
[device_mgt_conf.pull_notification_conf]
enabled=false

@ -0,0 +1,170 @@
<!--
~ Copyright (c) 2005 - 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
~ use this file except in compliance with the License. You may obtain a copy
~ of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software distributed
~ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
~ CONDITIONS OF ANY KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations under the License.
-->
<outputEventAdaptersConfig xmlns:svns="http://org.wso2.securevault/configuration">
<adapterConfig type="wso2event">
<property key="default.thrift.tcp.url">tcp://localhost:7612</property>
<property key="default.thrift.ssl.url">ssl://localhost:7712</property>
<property key="default.binary.tcp.url">tcp://localhost:9612</property>
<property key="default.binary.ssl.url">ssl://localhost:9712</property>
</adapterConfig>
<adapterConfig type="rdbms">
<property key="string">VARCHAR(255)</property>
<property key="double">DOUBLE</property>
<property key="integer">INT</property>
<property key="long">BIGINT</property>
<property key="float">FLOAT</property>
<property key="boolean">BOOL</property>
<property key="createTable">CREATE TABLE $TABLE_NAME ($COLUMN_TYPES)</property>
<property key="insertDataToTable">INSERT INTO $TABLE_NAME ($COLUMNS) VALUES ($VALUES)</property>
<property key="isTableExist">SELECT * FROM $TABLE_NAME limit 1</property>
<property key="updateTableRow">UPDATE $TABLE_NAME SET $COLUMN_VALUES WHERE $CONDITION</property>
<property key="comma">,</property>
<property key="questionMark">?</property>
<property key="equal">=</property>
<property key="and">AND</property>
<property key="selectAllColumnsDataTypeInTable">SELECT COLUMN_NAME, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$TABLE_NAME'</property>
<property key="selectFromTable">SELECT $COLUMNS FROM $TABLE_NAME</property>
<property key="oracle.string">varchar2(255)</property>
<property key="oracle.long">CLOB</property>
<property key="oracle.double">BINARY_DOUBLE</property>
<property key="oracle.isTableExist">SELECT * FROM $TABLE_NAME WHERE ROWNUM = 1</property>
<property key="oracle.selectAllColumnsDataTypeInTable">SELECT COLUMN_NAME, DATA_TYPE FROM USER_TAB_COLS WHERE TABLE_NAME = '$TABLE_NAME'</property>
<property key="mssql.string">varchar2(255)</property>
<property key="mssql.isTableExist">SELECT TOP 1 * FROM $TABLE_NAME</property>
<property key="mssql.selectAllColumnsDataTypeInTable">SELECT COLUMN_NAME, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$TABLE_NAME'</property>
<property key="h2.integer">varchar2(255)</property>
<property key="h2.long">REAL</property>
<property key="h2.selectAllColumnsDataTypeInTable">SHOW COLUMNS FROM $TABLE_NAME</property>
</adapterConfig>
<adapterConfig type="http">
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
<!-- HTTP Client Pool Related Properties -->
<property key="defaultMaxConnectionsPerHost">50</property>
<property key="maxTotalConnections">1000</property>
</adapterConfig>
<adapterConfig type="jms">
<!-- Thread Pool Related Properties -->
<property key="minThread">{{output_adapter.jms.min_thread}}</property>
<property key="maxThread">{{output_adapter.jms.max_thread}}</property>
<property key="keepAliveTimeInMillis">{{output_adapter.jms.keep_alive_time}}</property>
<property key="jobQueueSize">{{output_adapter.jms.job_queue_size}}</property>
</adapterConfig>
<adapterConfig type="mqtt">
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
<property key="connectionKeepAliveInterval">60</property>
</adapterConfig>
<adapterConfig type="kafka">
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
</adapterConfig>
<adapterConfig type="email">
<!-- Comment mail.smtp.user and mail.smtp.password properties to support connecting SMTP servers which use trust
based authentication rather username/password authentication -->
<property key="mail.smtp.from">{{output_adapter.email.from_address}}</property>
<property key="mail.smtp.user">{{output_adapter.email.username}}</property>
<property key="mail.smtp.password">{{output_adapter.email.password}}</property>
<property key="mail.smtp.host">{{output_adapter.email.hostname}}</property>
<property key="mail.smtp.port">{{output_adapter.email.port}}</property>
<property key="mail.smtp.starttls.enable">{{output_adapter.email.enable_start_tls}}</property>
<property key="mail.smtp.auth">{{output_adapter.email.enable_authentication}}</property>
<property key="mail.smtp.signature">{{output_adapter.email.signature}}</property>
<property key="mail.smtp.replyTo">{{output_adapter.email.reply_to}}</property>
{% if output_adapter.email.custom_properties is defined %}
<!-- Custom Properties -->
{% for property_name,property_value in output_adapter.email.custom_properties.items() %}
<property key="{{property_name}}">{{property_value}}</property>
{% endfor %}
{% endif %}
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
</adapterConfig>
<adapterConfig type="ui">
<property key="eventQueueSize">30</property>
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
</adapterConfig>
<adapterConfig type="websocket-local">
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
</adapterConfig>
<adapterConfig type="websocket">
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
</adapterConfig>
<adapterConfig type="soap">
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
<!-- Axis2 Client Connection Related Properties -->
<property key="axis2ClientConnectionTimeout">10000</property>
<property key="reuseHTTPClient">true</property>
<property key="autoReleaseConnection">true</property>
<property key="maxConnectionsPerHost">50</property>
</adapterConfig>
<adapterConfig type="oauth-mqtt">
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
<property key="connectionKeepAliveInterval">60</property>
<property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register</property>
<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
<property key="username">admin</property>
<property key="password">admin</property>
<property key="qos">2</property>
<property key="clearSession">true</property>
</adapterConfig>
</outputEventAdaptersConfig>

@ -0,0 +1,196 @@
<!--
~ Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2</groupId>
<artifactId>wso2</artifactId>
<version>1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>io.entgra.product.community</groupId>
<artifactId>iot-devicetype-feature-installation</artifactId>
<version>5.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Install Virtual Fire Alarm Device Types - IoT Core</name>
<build>
<plugins>
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
<version>5.1.2</version>
<executions>
<execution>
<id>2-p2-repo-generation</id>
<phase>package</phase>
<goals>
<goal>p2-repo-gen</goal>
</goals>
<configuration>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
<execution>
<id>default-feature-install</id>
<phase>package</phase>
<goals>
<goal>p2-profile-gen</goal>
</goals>
<configuration>
<profile>default</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>${basedir}/../repository/components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles>
<features>
<feature>
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<pluginRepositories>
<pluginRepository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
<pluginRepository>
<id>wso2.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
</pluginRepositories>
<repositories>
<!-- Before adding ANYTHING in here, please start a discussion on the dev list.
Ideally the Axis2 build should only use Maven central (which is available
by default) and nothing else. We had troubles with other repositories in
the past. Therefore configuring additional repositories here should be
considered very carefully. -->
<repository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>wso2.snapshots</id>
<name>WSO2 Snapshot Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>entgra-nexus</id>
<name>Entgra internal Repository</name>
<url>http://nexus.entgra.io/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>entgra.releases</id>
<name>Entgra internal Repository</name>
<url>http://nexus.entgra.io/repository/maven-releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>entgra.snapshots</id>
<name>Entgra Snapshot Repository</name>
<url>http://nexus.entgra.io/repository/maven-snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
<properties>
<!--This gets picked from the build properties, Do not change it-->
<carbon.device.mgt.plugin.version>6.0.16-SNAPSHOT</carbon.device.mgt.plugin.version>
</properties>
</project>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>io.entgra.product.community</groupId> <groupId>io.entgra.product.community</groupId>
<artifactId>p2-profile</artifactId> <artifactId>p2-profile</artifactId>
<version>5.1.3-SNAPSHOT</version> <version>5.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>io.entgra.product.community</groupId> <groupId>io.entgra.product.community</groupId>
<artifactId>p2-profile</artifactId> <artifactId>p2-profile</artifactId>
<version>5.1.3-SNAPSHOT</version> <version>5.2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -125,6 +125,15 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.device.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -149,6 +158,18 @@
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id> <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.extension.siddhi.device.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.extension.siddhi.execution.json.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>io.entgra.product.community</groupId> <groupId>io.entgra.product.community</groupId>
<artifactId>product-parent</artifactId> <artifactId>product-parent</artifactId>
<version>5.1.3-SNAPSHOT</version> <version>5.2.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -23,7 +23,7 @@
<groupId>io.entgra.product.community</groupId> <groupId>io.entgra.product.community</groupId>
<artifactId>product-parent</artifactId> <artifactId>product-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>5.1.3-SNAPSHOT</version> <version>5.2.1-SNAPSHOT</version>
<name>Entgra Community Product - Parent</name> <name>Entgra Community Product - Parent</name>
<url>http://entgra.io</url> <url>http://entgra.io</url>
<description>Entgra Community Product</description> <description>Entgra Community Product</description>
@ -364,14 +364,14 @@
<entgra-emm-community>entgra-emm-community-${project.version}</entgra-emm-community> <entgra-emm-community>entgra-emm-community-${project.version}</entgra-emm-community>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>5.0.21-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>5.0.25-SNAPSHOT</carbon.device.mgt.version>
<carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version> <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
<!--Orbit versions--> <!--Orbit versions-->
<orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version> <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
<carbon.device.mgt.plugin.version>6.0.13-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>6.0.16-SNAPSHOT</carbon.device.mgt.plugin.version>
<!--Testing--> <!--Testing-->
<google.gson.version>2.8.5</google.gson.version> <google.gson.version>2.8.5</google.gson.version>

Loading…
Cancel
Save