kavishka
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the conflicts

Browse Source
application-manager-new
geethkokila 7 years ago
parent 805668e65c a65075befe
commit 110f1c0d9f
21 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
modules/components/org.wso2.iot.core.admin.styles/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-components</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/components/pom.xml
Unescape View File

@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
modules/distribution/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

7
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -1630,6 +1630,13 @@
</outputDirectory>
<fileMode>755</fileMode>
</file>
<file>
<source>../scripts/change-superadmin-credentials.sh</source>
<outputDirectory>
${pom.artifactId}-${pom.version}/scripts
</outputDirectory>
<fileMode>755</fileMode>
</file>
<file>
<source>

2
modules/features/org.wso2.iot.core.styles.feature/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-features</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/features/pom.xml
Unescape View File

@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
modules/integration/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
modules/integration/tests-common/integration-common/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>tests-common</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/integration/tests-common/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/integration/tests-common/web-ui-pages/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>tests-common</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/integration/tests-integration/pom.xml
Unescape View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/integration/tests-iot-web-ui/pom.xml
Unescape View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-integration</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/p2-profile/analytics-profile/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-p2-profile</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/p2-profile/broker-profile/pom.xml
Unescape View File

@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-p2-profile</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-p2-profile</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
modules/p2-profile/pom.xml
Unescape View File

@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

4
modules/scripts/mobile-qsg/pom.xml
Unescape View File

@ -21,13 +21,13 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-scripts</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mobile-qsg</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<name>WSO2 IoT - QSG Script</name>
<description>This includes the tools for IoTs Quick Start Guide</description>
<packaging>jar</packaging>

2
modules/scripts/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

4
modules/tools/cdmf-devicetype-archetype/pom.xml
Unescape View File

@ -20,13 +20,13 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-tools</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>iot-devicetype-archetype</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<name>WSO2 IoT - Device Type Archetype</name>
<description>WSO2 IoT Device Type Archetype</description>
<packaging>maven-archetype</packaging>

2
modules/tools/pom.xml
Unescape View File

@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

4
pom.xml
Unescape View File

@ -23,7 +23,7 @@
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<packaging>pom</packaging>
<version>3.1.0-update11-SNAPSHOT</version>
<version>3.1.0-update12-SNAPSHOT</version>
<name>WSO2 IoT - Parent</name>
<url>http://wso2.org</url>
<description>WSO2 IoT Server</description>
@ -1524,7 +1524,7 @@
<product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.0.114</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>4.0.114</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>

Write Preview
Loading…
Cancel
Save