From d74259c446a2032f653e468aa98fce4b6dafe1ea Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Wed, 3 Dec 2014 11:04:38 +0530 Subject: [PATCH] Fixing pom formating and build xml --- modules/distribution/pom.xml | 37 ++++----------- modules/distribution/src/assembly/dist.xml | 1 + pom.xml | 55 +++++++++++++++++++++- 3 files changed, 65 insertions(+), 28 deletions(-) diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 019142c20..5b798a4ff 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -17,12 +17,6 @@ WSO2 Connected Device Manager (CDM) Distribution - - org.apache.shindig - shindig-server - 2.5.0-beta5 - war - javax.el el-api @@ -76,19 +70,9 @@ true target - - org.apache.shindig - shindig-server - 2.5.0-beta5 - war - true - target/shindig - - - @@ -107,7 +91,7 @@ - + @@ -122,7 +106,7 @@ dir="${tempdir}/wso2emm-${project.version}/repository/components"> - @@ -137,7 +121,7 @@ + todir="target/shindig"/>--> og4j.logger.net.sf.ehcache=ERROR @@ -153,7 +137,7 @@ package - @@ -165,7 +149,7 @@ - + --> @@ -189,7 +173,7 @@ - + @@ -203,6 +187,7 @@ org.apache.maven.plugins maven-assembly-plugin + 2.5.2 1-pre-dist @@ -212,6 +197,7 @@ attached + false ${basedir}/src/assembly/filter.properties @@ -221,7 +207,7 @@ - + - + --> diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml index d94b44651..d1bd5ea4f 100644 --- a/modules/distribution/src/assembly/dist.xml +++ b/modules/distribution/src/assembly/dist.xml @@ -16,6 +16,7 @@ ~ under the License. --> + 1-pre-dist zip diff --git a/pom.xml b/pom.xml index 2f1b5fe83..d13e5e45a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,14 +22,67 @@ modules/features modules/p2-profile-gen modules/distribution - + modules/integration 4.2.0 1.5.4 1.3 + + + 4.3.1 + 6.8 + 4.3.0-SNAPSHOT + 1.1.0 + + + + + org.wso2.emm + org.wso2.emm.integration.ui.pages + ${test.automation.emm.ui.version} + test + + + org.wso2.carbon.automation + org.wso2.carbon.automation.engine + ${test.framework.version} + test + + + org.wso2.carbon.automation + org.wso2.carbon.automation.test.utils + ${test.framework.version} + test + + + org.wso2.carbon + org.wso2.carbon.integration.common.extensions + ${stub.version} + test + + + org.wso2.carbon.automation + org.wso2.carbon.automation.extensions + ${test.framework.version} + test + + + org.testng + testng + ${testng.version} + + + org.wso2.carbon + org.wso2.carbon.integration.common.admin.client + ${stub.version} + test + + + +