From f44b4597db13174578485d62d6002dcc98192742 Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Thu, 29 Jan 2015 20:03:04 +0530 Subject: [PATCH] Fixing group ids of the pom files --- .../org.wso2.carbon.device.mgt.common/pom.xml | 2 +- .../org.wso2.carbon.device.mgt.core/pom.xml | 6 ++--- components/device-mgt/pom.xml | 4 +-- .../pom.xml | 4 +-- components/key-mgt/pom.xml | 4 +-- .../org.wso2.carbon.policy.evalutor/pom.xml | 6 ++--- .../org.wso2.carbon.policy.mgt.common/pom.xml | 4 +-- .../org.wso2.carbon.policy.mgt.core/pom.xml | 17 ++++++------- components/policy-mgt/pom.xml | 4 +-- .../pom.xml | 10 ++++---- features/device-mgt/pom.xml | 4 +-- .../pom.xml | 14 +++++------ features/policy-mgt/pom.xml | 4 +-- pom.xml | 25 +++++++++++-------- product/modules/p2-profile-gen/pom.xml | 4 +-- product/pom.xml | 2 +- 16 files changed, 59 insertions(+), 55 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml index f38b43881cf..2434dbdc6f2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> device-mgt - org.wso2.carbon + org.wso2.carbon.cdm 1.0.0-SNAPSHOT ../pom.xml diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml index 807357997c0..9513a12c8a2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml @@ -20,14 +20,14 @@ - org.wso2.carbon + org.wso2.carbon.cdm device-mgt 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.device.mgt.core 1.0.0-SNAPSHOT bundle @@ -92,7 +92,7 @@ org.eclipse.osgi - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.device.mgt.common diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index 4914e0e739f..a368a879f9f 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt/pom.xml @@ -22,14 +22,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.cdm wso2cdm-parent 1.0.0-SNAPSHOT ../../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm device-mgt 1.0.0-SNAPSHOT pom diff --git a/components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml b/components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml index 637004f6ed9..e71d5ce8f15 100644 --- a/components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml +++ b/components/key-mgt/org.wso2.carbon.key.mgt.handler.valve/pom.xml @@ -20,14 +20,14 @@ - org.wso2.carbon + org.wso2.carbon.cdm key-mgt 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.key.mgt.handler.valve 1.0.0-SNAPSHOT bundle diff --git a/components/key-mgt/pom.xml b/components/key-mgt/pom.xml index a9415614390..85c04889a93 100644 --- a/components/key-mgt/pom.xml +++ b/components/key-mgt/pom.xml @@ -22,14 +22,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.cdm wso2cdm-parent 1.0.0-SNAPSHOT ../../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm key-mgt 1.0.0-SNAPSHOT pom diff --git a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml index efaee90c29f..999a7d71fcd 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.evalutor/pom.xml @@ -19,14 +19,14 @@ - org.wso2.carbon + org.wso2.carbon.cdm policy-mgt 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.policy.evaluator 1.0.0-SNAPSHOT bundle @@ -79,7 +79,7 @@ org.wso2.carbon.logging - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.common diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml index 466f6b19c94..6056d324432 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml @@ -19,14 +19,14 @@ - org.wso2.carbon + org.wso2.carbon.cdm policy-mgt 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.common 1.0.0-SNAPSHOT bundle diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml index 1e3e5a44f98..43527ead7ba 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml @@ -19,14 +19,14 @@ - org.wso2.carbon + org.wso2.carbon.cdm policy-mgt 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.core 1.0.0-SNAPSHOT bundle @@ -83,12 +83,6 @@ org.wso2.carbon org.wso2.carbon.logging - - - org.wso2.carbon - org.wso2.carbon.policy.mgt.common - - org.wso2.carbon org.wso2.carbon.utils @@ -108,7 +102,12 @@ org.wso2.carbon org.wso2.carbon.logging - ${carbon.kernel.version} + + + + + org.wso2.carbon.cdm + org.wso2.carbon.policy.mgt.common diff --git a/components/policy-mgt/pom.xml b/components/policy-mgt/pom.xml index 369587f5bda..7fde904c103 100644 --- a/components/policy-mgt/pom.xml +++ b/components/policy-mgt/pom.xml @@ -21,14 +21,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.cdm wso2cdm-parent 1.0.0-SNAPSHOT ../../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm policy-mgt 1.0.0-SNAPSHOT pom diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml index 5b7a05969f5..0c14d19abc6 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.wso2.carbon + org.wso2.carbon.cdm device-mgt-feature 1.0.0-SNAPSHOT ../pom.xml @@ -49,11 +49,11 @@ org.wso2.carbon.logging - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.device.mgt.core - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.device.mgt.common @@ -106,9 +106,9 @@ - org.wso2.carbon:org.wso2.carbon.device.mgt.core:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.core:${project.version} - org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.common:${project.version} diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml index dd9fde54708..91d2b35f04a 100644 --- a/features/device-mgt/pom.xml +++ b/features/device-mgt/pom.xml @@ -22,14 +22,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.cdm wso2cdm-parent 1.0.0-SNAPSHOT ../../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm device-mgt-feature 1.0.0-SNAPSHOT pom diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml index 5cf75e12a18..2304236c525 100644 --- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.wso2.carbon + org.wso2.carbon.cdm policy-mgt-feature 1.0.0-SNAPSHOT ../pom.xml @@ -50,15 +50,15 @@ org.wso2.carbon.logging - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.core - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.common - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.policy.evaluator @@ -111,11 +111,11 @@ - org.wso2.carbon:org.wso2.carbon.policy.mgt.core:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.core:${project.version} - org.wso2.carbon:org.wso2.carbon.policy.mgt.common:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.common:${project.version} - org.wso2.carbon:org.wso2.carbon.policy.evaluator:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.policy.evaluator:${project.version} diff --git a/features/policy-mgt/pom.xml b/features/policy-mgt/pom.xml index 457a08dcb41..1129d79b275 100644 --- a/features/policy-mgt/pom.xml +++ b/features/policy-mgt/pom.xml @@ -21,14 +21,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.cdm wso2cdm-parent 1.0.0-SNAPSHOT ../../pom.xml 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm policy-mgt-feature 1.0.0-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index cc71985697e..baefafa62b3 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.wso2.carbon + org.wso2.carbon.cdm wso2cdm-parent pom 1.0.0-SNAPSHOT @@ -100,26 +100,35 @@ ${carbon.kernel.version} - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.device.mgt.core ${project.version} - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.device.mgt.common ${project.version} + + - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.common ${project.version} - org.wso2.carbon + org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.core ${project.version} + + + org.wso2.carbon.cdm + org.wso2.carbon.policy.evaluator + ${project.version} + + org.wso2.carbon org.wso2.carbon.governance.api @@ -198,11 +207,7 @@ ${carbon.kernel.version} - - org.wso2.carbon - org.wso2.carbon.policy.evaluator - ${project.version} - + diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index bab99d16e36..b9a20154e70 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -104,13 +104,13 @@ org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version} --> - org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.server.feature:${project.version} - org.wso2.carbon:org.wso2.carbon.policy.mgt.server.feature:${project.version} + org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.server.feature:${project.version} org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version} diff --git a/product/pom.xml b/product/pom.xml index bc3243141e0..ecf08c22f43 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.carbon + org.wso2.carbon.cdm wso2cdm-parent 1.0.0-SNAPSHOT ../pom.xml