From 61663b430b66c7649264cf647be140cd11c07f01 Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Fri, 30 Jan 2015 16:41:44 +0530 Subject: [PATCH] Fixing pom files - moving dependencies to parent pom, corretly propertizing the versions --- pom.xml | 251 ++++++++++++++++++++++--- product/modules/p2-profile-gen/pom.xml | 24 +-- 2 files changed, 241 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index e3742fa61..dadf6b518 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ org.wso2.carbon org.wso2.carbon.integration.common.admin.client - ${automation.stub.version} + ${test.automation.stub.version} test @@ -332,17 +332,17 @@ com.h2database.wso2 h2-database-engine - ${orbit.version.h2.engine} + ${orbit.h2.engine.version} org.apache.tomcat.wso2 tomcat - ${orbit.version.tomcat} + ${orbit.tomcat.version} org.apache.tomcat.wso2 jdbc-pool - ${tomcat.jdbc.pooling.version} + ${orbit.tomcat.jdbc.pooling.version} @@ -559,45 +559,252 @@ [1.0.0, 2.0.0) - 6.1.1 - 4.3.0-SNAPSHOT + + 1.5.4 + + 1.3 - [1.6.1.wso2v11, 1.7.0) - 1.0.0.Final - 1.5.4 - 2.0.0-SNAPSHOT + + + 0.9.0-SNAPSHOT - 1.1.0 - 1.0.0 - 1.0.0 - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT - 1.1.0 + 1.1.0 + 1.0.0 + 1.0.0 + 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT + 1.1.0 + 4.3.1 6.8 - 4.3.0-SNAPSHOT + 4.3.0-SNAPSHOT 1.1.0 3.6.100.v20120522-1841 3.8.1.v20120830-144521 - 1.2.140.wso2v3 + + + 1.2.140.wso2v3 + 7.0.52.wso2v5 + 7.0.34.wso2v2 + + + 4.3.0-SNAPSHOT - 7.0.52.wso2v5 - 7.0.34.wso2v2 - 1.0.0-SNAPSHOT + - + 1.0.0-SNAPSHOT + + 2.6.1 1.9.0 1.1.1 + + + 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-compiler-plugin + 2.3.1 + + UTF-8 + 1.6 + 1.6 + + + + 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/ + + + diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml index c21c73751..d75ed686a 100644 --- a/product/modules/p2-profile-gen/pom.xml +++ b/product/modules/p2-profile-gen/pom.xml @@ -119,22 +119,22 @@ org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version} - org.jaggeryjs.modules:carbon.feature:${carbon.feature.version} + org.jaggeryjs.modules:carbon.feature:${jaggery.carbon.module.version} - org.jaggeryjs.modules:process.feature:${process.feature.version} + org.jaggeryjs.modules:process.feature:${jaggery.process.module.version} - org.jaggeryjs.modules:uuid.feature:${uuid.feature.version} + org.jaggeryjs.modules:uuid.feature:${jaggery.uuid.module.version} - org.jaggeryjs.modules:sso.feature:${sso.feature.version} + org.jaggeryjs.modules:sso.feature:${jaggery.sso.feature.version} - org.jaggeryjs.modules:i18n.feature:${sso.feature.version} + org.jaggeryjs.modules:i18n.feature:${jaggery.i18n.feature.version} - org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version} + org.jaggeryjs.modules:jaggery-test.feature:${jaggery.test.feature.version} org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version} @@ -357,27 +357,27 @@ org.jaggeryjs.modules.carbon.feature.group - ${carbon.feature.version} + ${jaggery.carbon.module.version} org.jaggeryjs.modules.process.feature.group - ${process.feature.version} + ${jaggery.process.module.version} org.jaggeryjs.modules.uuid.feature.group - ${uuid.feature.version} + ${jaggery.uuid.module.version} org.jaggeryjs.modules.sso.feature.group - ${sso.feature.version} + ${jaggery.sso.feature.version} org.jaggeryjs.modules.i18n.feature.group - ${i18n.feature.version} + ${jaggery.i18n.feature.version} org.jaggeryjs.modules.jaggery-test.feature.group - ${jaggery-test.feature.version} + ${jaggery.test.feature.version} org.wso2.carbon.transport.mgt.feature.group