From d09128f4828fe1d217422013801dde7c43d5e605 Mon Sep 17 00:00:00 2001 From: Shabirmean Date: Mon, 7 Dec 2015 18:53:32 +0530 Subject: [PATCH 1/2] excluding "appmoauth2.war" from the build --- modules/distribution/src/assembly/bin.xml | 3 +++ modules/p2-profile-gen/pom.xml | 31 ++++++++++++----------- pom.xml | 18 ++++++------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index ff03f0d9..3e415d78 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -388,6 +388,9 @@ ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/ + + appmoauth2.war + false 644 diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 43e467a1..9fc576a3 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -439,7 +439,7 @@ - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt..feature.version} + org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version} @@ -447,23 +447,23 @@ - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt..feature.version} + org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version} - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt..feature.version} + org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt.feature.version} - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt..feature.version} + org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version} - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt..feature.version} + org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version} - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt..feature.version} + org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version} @@ -471,7 +471,7 @@ - org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt..feature.version} + org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version} @@ -1218,11 +1218,12 @@ org.wso2.carbon.appmgt.core.feature.group - ${appmgt..feature.version} + ${appmgt.feature.version} + - + @@ -1233,29 +1234,29 @@ org.wso2.carbon.appmgt.mdm.wso2emm.feature.group - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt.mdm.wso2mdm.feature.group - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt.mobile.feature.group - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt.publisher.feature.group - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt.services.api.feature.group - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt.store.feature.group - ${appmgt..feature.version} + ${appmgt.feature.version} diff --git a/pom.xml b/pom.xml index af2420f8..4f147aab 100644 --- a/pom.xml +++ b/pom.xml @@ -909,49 +909,49 @@ org.wso2.carbon.appmgt org.wso2.carbon.appmgt.core.feature - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt org.wso2.carbon.appmgt.feature - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt org.wso2.carbon.appmgt.mdm.wso2emm.feature - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt org.wso2.carbon.appmgt.mdm.wso2mdm.feature - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt org.wso2.carbon.appmgt.mobile.feature - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt org.wso2.carbon.appmgt.publisher.feature - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt org.wso2.carbon.appmgt.services.api.feature - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt org.wso2.carbon.appmgt.store.feature - ${appmgt..feature.version} + ${appmgt.feature.version} org.wso2.carbon.appmgt @@ -1103,7 +1103,7 @@ 2.3.1 - 1.1.1 + 1.1.1 1.1.1 From 85bc5bd201da13b661878a714ef1fa2c0ef41176 Mon Sep 17 00:00:00 2001 From: Shabirmean Date: Mon, 7 Dec 2015 23:46:44 +0530 Subject: [PATCH 2/2] Adding SocialDB creation execution to distribution pom --- modules/p2-profile-gen/pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 9fc576a3..8b2bfe74 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -474,9 +474,9 @@ org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version} - - org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version} - + + + @@ -1261,10 +1261,10 @@ - - org.wso2.carbon.social.feature.group - ${carbon.store.version} - + + + +