Fixing group ids of the pom files

revert-70aa11f8
Geeth Munasinghe 10 years ago
parent 8a25f55ac2
commit f44b4597db

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>device-mgt</artifactId>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -20,14 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>device-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@ -92,7 +92,7 @@
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
</dependency>
<dependency>

@ -22,14 +22,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>device-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

@ -20,14 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>key-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.key.mgt.handler.valve</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>

@ -22,14 +22,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>key-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

@ -19,14 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.evaluator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@ -79,7 +79,7 @@
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
</dependency>
</dependencies>

@ -19,14 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>

@ -19,14 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@ -83,12 +83,6 @@
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
@ -108,7 +102,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
<version>${carbon.kernel.version}</version>
</dependency>
<!-- Policy Management Dependencies-->
<dependency>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
</dependency>
</dependencies>

@ -21,14 +21,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>device-mgt-feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -49,11 +49,11 @@
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
</dependency>
</dependencies>
@ -106,9 +106,9 @@
</properties>
</adviceFile>
<bundles>
<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.core:${project.version}
<bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.core:${project.version}
</bundleDef>
<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version}
<bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.device.mgt.common:${project.version}
</bundleDef>
</bundles>
<importFeatures>

@ -22,14 +22,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>device-mgt-feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt-feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -50,15 +50,15 @@
<artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.evaluator</artifactId>
</dependency>
</dependencies>
@ -111,11 +111,11 @@
</properties>
</adviceFile>
<bundles>
<bundleDef>org.wso2.carbon:org.wso2.carbon.policy.mgt.core:${project.version}
<bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.core:${project.version}
</bundleDef>
<bundleDef>org.wso2.carbon:org.wso2.carbon.policy.mgt.common:${project.version}
<bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.policy.mgt.common:${project.version}
</bundleDef>
<bundleDef>org.wso2.carbon:org.wso2.carbon.policy.evaluator:${project.version}
<bundleDef>org.wso2.carbon.cdm:org.wso2.carbon.policy.evaluator:${project.version}
</bundleDef>
</bundles>
<importFeatures>

@ -21,14 +21,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>policy-mgt-feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

@ -22,7 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
@ -100,26 +100,35 @@
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>${project.version}</version>
</dependency>
<!--CDM policy dependencies-->
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>org.wso2.carbon.policy.evaluator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.governance.api</artifactId>
@ -198,11 +207,7 @@
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.policy.evaluator</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

@ -104,13 +104,13 @@
org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
</featureArtifactDef>-->
<featureArtifactDef>
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}
</featureArtifactDef>
<!--<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version}
</featureArtifactDef>-->
<featureArtifactDef>
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}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.webapp.mgt.feature:${carbon.platform.version}

@ -21,7 +21,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.wso2.carbon</groupId>
<groupId>org.wso2.carbon.cdm</groupId>
<artifactId>wso2cdm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>

Loading…
Cancel
Save