community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1436 from ruwany/master

Browse Source 
Bumping kernel and devicemgt core/plugin dependencies
This commit is contained in:
Madawa Soysa 2017-10-04 14:22:57 +05:30 committed by GitHub
commit 86843e94c4
5 changed files with 9 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
modules/distribution/src/assembly/bin.xml
View File

@ -70,9 +70,6 @@
<exclude>**/master-datasources.xml</exclude>
<exclude>**/carbon.xml</exclude>
<exclude>**/registry.xml</exclude>
<exclude>**/client-truststore.jks</exclude>
<exclude>**/wso2carbon.jks</exclude>
<exclude>**/wso2carbon.jks</exclude>
<exclude>**/WSO2AM_DB.h2.db</exclude>
<exclude>**/WSO2DM_DB.h2.db</exclude>
<exclude>**/lib/httpmime*</exclude>
@ -253,8 +250,6 @@
<exclude>**/synapse-configs/**</exclude>
<exclude>**/web-apps/**</exclude>
<exclude>**/appm-tenant-conf.xml</exclude>
<exclude>**/client-truststore.jks</exclude>
<exclude>**/wso2carbon.jks</exclude>
</excludes>
</fileSet>
@ -326,10 +321,6 @@
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources
</outputDirectory>
<excludes>
<exclude>**/client-truststore.jks</exclude>
<exclude>**/wso2carbon.jks</exclude>
</excludes>
</fileSet>
<!-- Copying device type deployer files -->
@ -697,8 +688,6 @@
<exclude>**/LICENSE.txt</exclude>
<exclude>**/release-notes.html</exclude>
<exclude>**/webapp-mode/WEB-INF/web.xml</exclude>
<exclude>**/repository/resources/security/client-truststore.jks</exclude>
<exclude>**/repository/resources/security/wso2carbon.jks</exclude>
</excludes>
</fileSet>
@ -988,8 +977,6 @@
<exclude>**/LICENSE.txt</exclude>
<exclude>**/release-notes.html</exclude>
<exclude>**/dbscripts</exclude>
<exclude>**/repository/resources/security/client-truststore.jks</exclude>
<exclude>**/repository/resources/security/wso2carbon.jks</exclude>
</excludes>
</fileSet>
@ -1972,41 +1959,5 @@
<fileMode>644</fileMode>
</file>
<!-- ********************************* End of Broker Profile ********************************* -->
<!--Start - Need to remove after kernel 4.4.17 release-->
<file>
<source>src/core/resources/security/client-truststore.jks</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/resources/security/client-truststore.jks</source>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/resources/security/client-truststore.jks</source>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/resources/security/wso2carbon.jks</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security</outputDirectory>
<filtered>false</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/resources/security/wso2carbon.jks</source>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security</outputDirectory>
<filtered>false</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/core/resources/security/wso2carbon.jks</source>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
<filtered>false</filtered>
<fileMode>644</fileMode>
</file>
<!--End-->
</files>
</assembly>

4
modules/p2-profile/analytics-profile/carbon.product
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.16" useFeatures="true" includeLaunchers="true">
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.17" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@ -13,7 +13,7 @@
</plugins>
<features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
<feature id="org.wso2.carbon.core.runtime" version="4.4.17"/>
</features>
<configurations>

4
modules/p2-profile/broker-profile/carbon.product
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.16" useFeatures="true" includeLaunchers="true">
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.17" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@ -13,7 +13,7 @@
</plugins>
<features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
<feature id="org.wso2.carbon.core.runtime" version="4.4.17"/>
</features>
<configurations>

4
modules/p2-profile/iot-core-profile/carbon.product
View File

@ -2,7 +2,7 @@
<?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
version="4.4.16" useFeatures="true" includeLaunchers="true">
version="4.4.17" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@ -14,7 +14,7 @@ version="4.4.16" useFeatures="true" includeLaunchers="true">
</plugins>
<features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
<feature id="org.wso2.carbon.core.runtime" version="4.4.17"/>
</features>
<configurations>

6
pom.xml
View File

@ -1446,7 +1446,7 @@
<properties>
<!--Carbon kernel versions-->
<carbon.kernel.version>4.4.16</carbon.kernel.version>
<carbon.kernel.version>4.4.17</carbon.kernel.version>
<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
<carbon.ui.menu.stratos.version>2.2.0</carbon.ui.menu.stratos.version>
@ -1517,14 +1517,14 @@
<carbon.governance.version>4.7.8</carbon.governance.version>
<!-- Carbon Device Management -->
<carbon.device.mgt.version>3.0.112</carbon.device.mgt.version>
<carbon.device.mgt.version>3.0.135</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.0.82</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>4.0.87</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>