rushdi-entgra.io
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:wso2/product-cdm

Browse Source
revert-70aa11f8
Dulitha Wijewantha 10 years ago
parent 49c490a183 462045eac9
commit 773fba11bf
22 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File

4
components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
Unescape View File

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Management Commons</name> <name>WSO2 Carbon - Device Management Commons</name>
<description>WSO2 Carbon - Device Management Commons</description> <description>WSO2 Carbon - Device Management Commons</description>

4
components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
Unescape View File

@ -22,14 +22,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId> <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Device Management Core</name> <name>WSO2 Carbon - Device Management Core</name>
<description>WSO2 Carbon - Device Management Core</description> <description>WSO2 Carbon - Device Management Core</description>

4
components/device-mgt/pom.xml
Unescape View File

@ -24,14 +24,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>device-mgt</artifactId> <artifactId>device-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Component</name> <name>WSO2 Carbon - Device Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

4
components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml
Unescape View File

@ -22,14 +22,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>key-mgt</artifactId> <artifactId>key-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.key.mgt.handler.valve</artifactId> <artifactId>org.wso2.carbon.key.mgt.handler.valve</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Key Management Handler Valve</name> <name>WSO2 Carbon - Key Management Handler Valve</name>
<description>WSO2 Carbon - Key Management Handler Valve</description> <description>WSO2 Carbon - Key Management Handler Valve</description>

6
components/key-mgt/pom.xml
Unescape View File

@ -24,14 +24,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>key-mgt</artifactId> <artifactId>key-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Component</name> <name>WSO2 Carbon - Device Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
@ -61,7 +61,7 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.osgi</groupId> <groupId>org.eclipse.osgi</groupId>

4
components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml
Unescape View File

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.evaluator</artifactId> <artifactId>org.wso2.carbon.policy.evaluator</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Decision Point</name> <name>WSO2 Carbon - Policy Decision Point</name>
<description>WSO2 Carbon - Policy Decision Point</description> <description>WSO2 Carbon - Policy Decision Point</description>

4
components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
Unescape View File

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId> <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Management Common</name> <name>WSO2 Carbon - Policy Management Common</name>
<description>WSO2 Carbon - Policy Management Common</description> <description>WSO2 Carbon - Policy Management Common</description>

4
components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
Unescape View File

@ -21,14 +21,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId> <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>WSO2 Carbon - Policy Management Core</name> <name>WSO2 Carbon - Policy Management Core</name>
<description>WSO2 Carbon - Policy Management Core</description> <description>WSO2 Carbon - Policy Management Core</description>

4
components/policy-mgt/pom.xml
Unescape View File

@ -23,14 +23,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt</artifactId> <artifactId>policy-mgt</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Policy Management Component</name> <name>WSO2 Carbon - Policy Management Component</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

4
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
Unescape View File

@ -22,14 +22,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>device-mgt-feature</artifactId> <artifactId>device-mgt-feature</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId> <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<name>WSO2 Carbon - Device Management Server Feature</name> <name>WSO2 Carbon - Device Management Server Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>This feature contains the core bundles required for Back-end Devvice Management functionality <description>This feature contains the core bundles required for Back-end Devvice Management functionality

4
features/device-mgt/pom.xml
Unescape View File

@ -24,14 +24,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>device-mgt-feature</artifactId> <artifactId>device-mgt-feature</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Device Management Feature</name> <name>WSO2 Carbon - Device Management Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

4
features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
Unescape View File

@ -23,14 +23,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt-feature</artifactId> <artifactId>policy-mgt-feature</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId> <artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<name>WSO2 Carbon - Policy Management Server Feature</name> <name>WSO2 Carbon - Policy Management Server Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>This feature contains the core bundles required for Back-end Devvice Management functionality <description>This feature contains the core bundles required for Back-end Devvice Management functionality

4
features/policy-mgt/pom.xml
Unescape View File

@ -23,14 +23,14 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>policy-mgt-feature</artifactId> <artifactId>policy-mgt-feature</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 Carbon - Policy Management Feature</name> <name>WSO2 Carbon - Policy Management Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

4
pom.xml
Unescape View File

@ -25,7 +25,7 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<name>WSO2 CDM - Parent</name> <name>WSO2 CDM - Parent</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>
<description>WSO2 Connected Device Manager</description> <description>WSO2 Connected Device Manager</description>
@ -213,7 +213,7 @@
<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>
<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version> <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<cdm.version>2.0.0-SNAPSHOT</cdm.version> <cdm.version>1.0.0-SNAPSHOT</cdm.version>
<!--Jaggery --> <!--Jaggery -->
<jaggery.feature.version>0.9.0-SNAPSHOT</jaggery.feature.version> <jaggery.feature.version>0.9.0-SNAPSHOT</jaggery.feature.version>
<carbon.feature.version>1.1.0</carbon.feature.version> <carbon.feature.version>1.1.0</carbon.feature.version>

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

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
product/modules/integration/pom.xml
Unescape View File

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

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

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

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

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

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

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdm-integration</artifactId> <artifactId>wso2cdm-integration</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

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

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>cdm-integration-tests-common</artifactId> <artifactId>cdm-integration-tests-common</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.wso2.cdmserver</groupId> <groupId>org.wso2.cdmserver</groupId>
<artifactId>wso2cdmserver-product</artifactId> <artifactId>wso2cdmserver-product</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
product/pom.xml
Unescape View File

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>wso2cdm-parent</artifactId> <artifactId>wso2cdm-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

Write Preview
Loading…
Cancel
Save