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

Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0

Browse Source
application-manager-new
ayyoob 8 years ago
parent 232e63aeea 5e43195e55
commit 7290f64711
21 changed files with 42 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
modules/analytics/distribution/pom.xml
Unescape View File

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

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

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

2
modules/analytics/pom.xml
Unescape View File

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

2
modules/broker/distribution/pom.xml
Unescape View File

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

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

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

2
modules/broker/pom.xml
Unescape View File

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

29
modules/core/distribution/pom.xml
Unescape View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-core-parent</artifactId> <artifactId>wso2iot-core-parent</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -650,24 +650,15 @@
<delete file="${tempdir}/secured-websocket/WEB-INF/web.xml" /> <delete file="${tempdir}/secured-websocket/WEB-INF/web.xml" />
<delete file="${tempdir}/shindig/WEB-INF/web.xml" /> <delete file="${tempdir}/shindig/WEB-INF/web.xml" />
<copy file="src/repository/resources/web-apps/web-xml/api-application-registration/web.xml" <copy file="src/repository/resources/web-apps/web-xml/api-application-registration/web.xml" tofile="${tempdir}/api-application-registration/WEB-INF/web.xml" />
tofile="${tempdir}/api-application-registration/WEB-INF/web.xml"/> <copy file="src/repository/resources/web-apps/web-xml/api#certificate-mgt#v1.0/web.xml" tofile="${tempdir}/api#certificate-mgt#v1.0/WEB-INF/web.xml" />
<copy file="src/repository/resources/web-apps/web-xml/api#certificate-mgt#v1.0/web.xml" <copy file="src/repository/resources/web-apps/web-xml/api#identity#entitlement/web.xml" tofile="${tempdir}/api#identity#entitlement/WEB-INF/web.xml" />
tofile="${tempdir}/api#certificate-mgt#v1.0/WEB-INF/web.xml"/> <copy file="src/repository/resources/web-apps/web-xml/api#scep-mgt#v1.0/web.xml" tofile="${tempdir}/api#scep-mgt#v1.0/WEB-INF/web.xml" />
<copy file="src/repository/resources/web-apps/web-xml/api#identity#entitlement/web.xml" <copy file="src/repository/resources/web-apps/web-xml/authenticationendpoint/web.xml" tofile="${tempdir}/authenticationendpoint/WEB-INF/web.xml" />
tofile="${tempdir}/api#identity#entitlement/WEB-INF/web.xml"/> <copy file="src/repository/resources/web-apps/web-xml/client-registration#v0.11/web.xml" tofile="${tempdir}/client-registration#v0.11/WEB-INF/web.xml" />
<copy file="src/repository/resources/web-apps/web-xml/api#scep-mgt#v1.0/web.xml" <copy file="src/repository/resources/web-apps/web-xml/oauth2/web.xml" tofile="${tempdir}/oauth2/WEB-INF/web.xml" />
tofile="${tempdir}/api#scep-mgt#v1.0/WEB-INF/web.xml"/> <copy file="src/repository/resources/web-apps/web-xml/secured-websocket/web.xml" tofile="${tempdir}/secured-websocket/WEB-INF/web.xml" />
<copy file="src/repository/resources/web-apps/web-xml/authenticationendpoint/web.xml" <copy file="src/repository/resources/web-apps/web-xml/shindig/web.xml" tofile="${tempdir}/shindig/WEB-INF/web.xml" />
tofile="${tempdir}/authenticationendpoint/WEB-INF/web.xml"/>
<copy file="src/repository/resources/web-apps/web-xml/client-registration#v0.11/web.xml"
tofile="${tempdir}/client-registration#v0.11/WEB-INF/web.xml"/>
<copy file="src/repository/resources/web-apps/web-xml/oauth2/web.xml"
tofile="${tempdir}/oauth2/WEB-INF/web.xml"/>
<copy file="src/repository/resources/web-apps/web-xml/secured-websocket/web.xml"
tofile="${tempdir}/secured-websocket/WEB-INF/web.xml"/>
<copy file="src/repository/resources/web-apps/web-xml/shindig/web.xml"
tofile="${tempdir}/shindig/WEB-INF/web.xml"/>
<zip destfile="${tempdir}/api-application-registration.war" basedir="${tempdir}/api-application-registration" /> <zip destfile="${tempdir}/api-application-registration.war" basedir="${tempdir}/api-application-registration" />
<zip destfile="${tempdir}/api#certificate-mgt#v1.0.war" basedir="${tempdir}/api#certificate-mgt#v1.0" /> <zip destfile="${tempdir}/api#certificate-mgt#v1.0.war" basedir="${tempdir}/api#certificate-mgt#v1.0" />

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

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

2
modules/core/features/pom.xml
Unescape View File

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

2
modules/core/iotserver-ui/pom.xml
Unescape View File

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

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

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

2
modules/core/pom.xml
Unescape View File

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

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

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

2
modules/core/tools/pom.xml
Unescape View File

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

2
modules/distribution/pom.xml
Unescape View File

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

2
modules/integration/pom.xml
Unescape View File

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

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

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

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

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

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

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

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

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

4
pom.xml
Unescape View File

@ -23,7 +23,7 @@
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId> <artifactId>wso2iot-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0-SNAPSHOT</version>
<name>WSO2 IoT - Parent</name> <name>WSO2 IoT - Parent</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>WSO2 IoT Server</description> <description>WSO2 IoT Server</description>
@ -1533,7 +1533,7 @@
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>3.0.0-SNAPSHOT</product.iot.version> <product.iot.version>3.1.0-SNAPSHOT</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.9-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>3.0.9-SNAPSHOT</carbon.device.mgt.plugin.version>

Write Preview
Loading…
Cancel
Save