From 65fa0fcd6193bdda0dd9f51e43ddd55d717a7e2e Mon Sep 17 00:00:00 2001 From: harshanL Date: Mon, 2 Feb 2015 21:49:24 +0530 Subject: [PATCH] Fixed the issues in build --- .../org.wso2.carbon.device.mgt.core/pom.xml | 2 +- pom.xml | 24 +++++------- .../tests-common/admin-clients/pom.xml | 4 +- .../integration-test-utils/pom.xml | 4 +- .../integration/tests-common/ui-pages/pom.xml | 4 +- product/modules/p2-profile-gen/pom.xml | 39 ++++++++++--------- 6 files changed, 37 insertions(+), 40 deletions(-) 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 1d426a62197..3c28bb751eb 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 @@ -139,7 +139,7 @@ org.wso2.carbon.user.api - org.wso2.carbon + org.wso2.carbon.governance org.wso2.carbon.governance.api diff --git a/pom.xml b/pom.xml index 9fdb630f024..952963d3c90 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,7 @@ ${carbon.kernel.version} - org.wso2.carbon + org.wso2.carbon.governance org.wso2.carbon.governance.api ${carbon.governance.version} @@ -575,9 +575,9 @@ - https://github.com/wso2/product-mdm.git - scm:git:https://github.com/wso2/product-mdm.git - scm:git:https://github.com/wso2/product-mdm.git + https://github.com/wso2/product-cdm.git + scm:git:https://github.com/wso2/product-cdm.git + scm:git:https://github.com/wso2/product-cdm.git HEAD @@ -619,7 +619,7 @@ maven-release-plugin clean install - true + false @@ -780,11 +780,11 @@ 0.9.0.ALPHA6 1.0.0 - 1.1.0-SNAPSHOT + 1.2.0 4.3.1 - 4.3.0-SNAPSHOT + 4.3.0 6.8 1.1.0 @@ -802,14 +802,11 @@ 4.3.2 - - 4.3.0-SNAPSHOT - 4.3.0 - 4.3.0 + 4.3.1 4.3.0 @@ -818,10 +815,7 @@ 4.3.0 - 4.3.0-SNAPSHOT - - - 4.3.0-SNAPSHOT + 4.3.0 1.0.0-SNAPSHOT diff --git a/product/modules/integration/tests-common/admin-clients/pom.xml b/product/modules/integration/tests-common/admin-clients/pom.xml index 48d8c6aaac3..10a57d72aa9 100644 --- a/product/modules/integration/tests-common/admin-clients/pom.xml +++ b/product/modules/integration/tests-common/admin-clients/pom.xml @@ -29,8 +29,8 @@ 4.0.0 - org.wso2.cdm - org.wso2.cdm.integration.common.clients + org.wso2.carbon.cdm + org.wso2.carbon.cdm.integration.common.clients jar WSO2 CDM - Integration Admin Clients diff --git a/product/modules/integration/tests-common/integration-test-utils/pom.xml b/product/modules/integration/tests-common/integration-test-utils/pom.xml index db30f96b55d..560011cbf2c 100644 --- a/product/modules/integration/tests-common/integration-test-utils/pom.xml +++ b/product/modules/integration/tests-common/integration-test-utils/pom.xml @@ -29,8 +29,8 @@ 4.0.0 - org.wso2.cdm.integration.common.utils - org.wso2.cdm + org.wso2.carbon.cdm.integration.common.utils + org.wso2.carbon.cdm jar WSO2 CDM - Integration Test Utils diff --git a/product/modules/integration/tests-common/ui-pages/pom.xml b/product/modules/integration/tests-common/ui-pages/pom.xml index 4524a0eee12..6adb6f73344 100644 --- a/product/modules/integration/tests-common/ui-pages/pom.xml +++ b/product/modules/integration/tests-common/ui-pages/pom.xml @@ -29,8 +29,8 @@ 4.0.0 - org.wso2.cdm - org.wso2.cdm.integration.ui.pages + org.wso2.carbon.cdm + org.wso2.carbon.cdm.integration.ui.pages jar WSO2 CDM - Integration Test Ui Pages diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index 6e51f1f530e..9eb4126ce49 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -140,11 +140,14 @@ org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.feature:${carbon.deployment.version} - - - org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version} + org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version} + + + org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version} + + @@ -159,9 +162,7 @@ org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version} - - org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.transport.mgt.version} - + @@ -178,7 +179,7 @@ - org.wso2.carbon:org.wso2.carbon.security.mgt.feature:${carbon.platform.version} + org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version} - org.wso2.carbon:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version} + org.wso2.carbon.governance:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version} - org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version} + org.wso2.carbon.governance:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version} - org.wso2.carbon:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version} + org.wso2.carbon.governance:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version} @@ -328,12 +329,17 @@ org.wso2.carbon.webapp.mgt.feature.group ${carbon.deployment.version} - - + + org.wso2.carbon.webapp.mgt.server.feature.group + ${carbon.deployment.version} + org.wso2.carbon.as.runtimes.cxf.feature.group - ${carbon.platform.version} + ${carbon.deployment.version} + + + @@ -351,10 +357,7 @@ org.wso2.carbon.logging.mgt.feature.group ${carbon.commons.version} - - org.wso2.carbon.transport.mgt.feature.group - ${carbon.transport.mgt.version} - + @@ -374,7 +377,7 @@ org.wso2.carbon.security.mgt.feature.group - ${carbon.platform.version} + ${carbon.identity.version}