From 381ef5d6889fa698902a71997259f5f93bec4957 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Fri, 30 Jan 2015 16:51:32 +0530 Subject: [PATCH] Pom refactoring --- pom.xml | 330 ++++++++++++++---- .../integration/tests-common/ui-pages/pom.xml | 2 +- 2 files changed, 270 insertions(+), 62 deletions(-) diff --git a/pom.xml b/pom.xml index baefafa62b..2aaa03d50e 100644 --- a/pom.xml +++ b/pom.xml @@ -44,61 +44,43 @@ product - + + org.wso2.carbon.automation org.wso2.carbon.automation.engine - ${test.framework.version} + ${automation.test.framework.version} test org.wso2.carbon.automation org.wso2.carbon.automation.test.utils - ${test.framework.version} + ${automation.test.framework.version} test - org.wso2.carbon - org.wso2.carbon.integration.common.extensions - ${stub.version} + org.wso2.carbon.automation + org.wso2.carbon.automation.extensions + ${automation.test.framework.version} test - org.wso2.carbon.automation - org.wso2.carbon.automation.extensions - ${test.framework.version} + org.wso2.carbon.automationutils + org.wso2.carbon.integration.common.extensions + ${automation.test.framework.version} test - org.wso2.carbon + org.wso2.carbon.automationutils org.wso2.carbon.integration.common.admin.client - ${stub.version} + ${automation.test.framework.version} test + - - org.wso2.carbon - org.wso2.carbon.user.core - ${carbon.kernel.version} - - - org.apache.felix - javax.servlet - - - - - org.wso2.carbon - org.wso2.carbon.user.api - ${carbon.kernel.version} - - - org.wso2.carbon - org.wso2.carbon.logging - ${carbon.kernel.version} - + org.wso2.carbon.cdm org.wso2.carbon.device.mgt.core @@ -109,9 +91,6 @@ org.wso2.carbon.device.mgt.common ${project.version} - - - org.wso2.carbon.cdm org.wso2.carbon.policy.mgt.common @@ -122,19 +101,22 @@ 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 - ${carbon.platform.version} + ${governance.version} - + + + org.eclipse.osgi org.eclipse.osgi @@ -145,12 +127,21 @@ org.eclipse.equinox.common ${eclipse.equinox.common.version} + + org.eclipse.osgi + org.eclipse.osgi.services + 3.3.100.v20120522-1822 + + org.testng testng ${testng.version} + test + + org.wso2.carbon org.wso2.carbon.utils @@ -172,47 +163,258 @@ ${carbon.kernel.version} - org.eclipse.osgi - org.eclipse.osgi.services - 3.3.100.v20120522-1822 - - - com.h2database.wso2 - h2-database-engine - ${orbit.version.h2.engine} + org.apache.tomcat.wso2 + tomcat + ${orbit.version.tomcat} org.wso2.carbon - org.wso2.carbon.apimgt.core - ${apim.version} + org.wso2.carbon.tomcat.ext + ${carbon.kernel.version} org.wso2.carbon - org.wso2.carbon.apimgt.impl - ${apim.version} + org.wso2.carbon.tomcat + ${carbon.kernel.version} - org.apache.tomcat.wso2 - tomcat - ${orbit.version.tomcat} + org.wso2.carbon + org.wso2.carbon.user.core + ${carbon.kernel.version} + + + org.apache.felix + javax.servlet + + org.wso2.carbon - org.wso2.carbon.tomcat.ext + org.wso2.carbon.user.api ${carbon.kernel.version} org.wso2.carbon - org.wso2.carbon.tomcat + org.wso2.carbon.logging ${carbon.kernel.version} + + + com.h2database.wso2 + h2-database-engine + ${orbit.version.h2.engine} + - + + + org.wso2.carbon + org.wso2.carbon.apimgt.core + ${apim.version} + + + org.wso2.carbon + org.wso2.carbon.apimgt.impl + ${apim.version} + + + + 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 + HEAD + + + + + + + org.apache.maven.wagon + wagon-ssh + 2.1 + + + + + + org.jvnet.maven.incrementalbuild + incremental-build-plugin + 1.3 + + + + incremental-build + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-release-plugin + + clean install + true + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + + + org.apache.felix + maven-scr-plugin + 1.7.2 + + + generate-scr-scrdescriptor + + scr + + + + + + org.apache.felix + maven-bundle-plugin + 2.3.5 + true + + NONE + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + verify + + jar-no-fork + + + + + + maven-assembly-plugin + 2.2-beta-2 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + + + + + + wso2.releases + WSO2 internal Repository + http://maven.wso2.org/nexus/content/repositories/releases/ + + true + daily + ignore + + + + wso2.snapshots + Apache Snapshot Repository + http://maven.wso2.org/nexus/content/repositories/snapshots/ + + true + daily + + + false + + + + wso2-nexus + WSO2 internal Repository + http://maven.wso2.org/nexus/content/groups/wso2-public/ + + true + daily + ignore + + + + + + + + wso2-nexus + WSO2 internal Repository + http://maven.wso2.org/nexus/content/groups/wso2-public/ + + true + daily + ignore + + + + wso2.releases + WSO2 internal Repository + http://maven.wso2.org/nexus/content/repositories/releases/ + + true + daily + ignore + + + + wso2.snapshots + WSO2 Snapshot Repository + http://maven.wso2.org/nexus/content/repositories/snapshots/ + + true + daily + + + false + + + + nexus-releases + WSO2 Release Distribution Repository + http://maven.wso2.org/nexus/service/local/staging/deploy/maven2/ + + + + 6.1.1 4.3.0 @@ -223,6 +425,7 @@ 1.0.0.Final 1.5.4 1.0.0-SNAPSHOT + 0.9.0-SNAPSHOT 1.1.0 @@ -230,20 +433,25 @@ 1.0.0 1.1.0-SNAPSHOT 1.1.0 + - 4.3.1 + 4.3.1 6.8 - 4.3.0-SNAPSHOT 1.1.0 - + 3.6.100.v20120522-1841 3.8.1.v20120830-144521 1.2.140.wso2v3 - 1.2.1 7.0.52.wso2v5 - + + 1.2.4 + + + 4.3.0 + + diff --git a/product/modules/integration/tests-common/ui-pages/pom.xml b/product/modules/integration/tests-common/ui-pages/pom.xml index a500abf9b8..4524a0eee1 100644 --- a/product/modules/integration/tests-common/ui-pages/pom.xml +++ b/product/modules/integration/tests-common/ui-pages/pom.xml @@ -36,7 +36,7 @@ - org.wso2.carbon + org.wso2.carbon.automationutils org.wso2.carbon.integration.common.admin.client compile