From 359eabde494ea18852456858bc8f3fff62bc9549 Mon Sep 17 00:00:00 2001 From: susinda Date: Wed, 16 Nov 2016 10:53:04 +0530 Subject: [PATCH] reverting commit 'MQTT profile commented, apim.integration.feature added' --- .../core/distribution/src/assembly/bin.xml | 8 ------- modules/core/p2-profile-gen/pom.xml | 22 +++++++++---------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml index 61a172ea..5ce94fe8 100644 --- a/modules/core/distribution/src/assembly/bin.xml +++ b/modules/core/distribution/src/assembly/bin.xml @@ -1228,13 +1228,5 @@ true 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/apim-integration.xml - ${pom.artifactId}-${pom.version}/repository/conf - apim-integration.xml - true - 644 - diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml index fb6d4094..06900f48 100644 --- a/modules/core/p2-profile-gen/pom.xml +++ b/modules/core/p2-profile-gen/pom.xml @@ -206,9 +206,6 @@ org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version} - - org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.apim.integration.feature:${carbon.device.mgt.version} - @@ -847,10 +844,6 @@ org.wso2.carbon.apimgt.webapp.publisher.feature.group ${carbon.device.mgt.version} - - org.wso2.carbon.apimgt.apim.integration.feature.group - ${carbon.device.mgt.version} - org.wso2.carbon.device.mgt.oauth.extensions.feature.group ${carbon.device.mgt.version} @@ -948,8 +941,6 @@ org.wso2.carbon.forum.server.feature.group ${carbon.api.mgt.version} - - @@ -1410,7 +1401,7 @@ - 4-p2-profile-generation package @@ -1426,10 +1417,13 @@ true + org.wso2.iot.core.styles.feature.group ${product.iot.version} + + org.wso2.carbon.appmgt.core.feature.group ${appmgt.feature.version} @@ -1454,6 +1448,7 @@ org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group ${carbon.device.mgt.plugin.version} + org.wso2.carbon.logging.mgt.feature.group ${carbon.commons.version} @@ -1502,6 +1497,7 @@ org.wso2.carbon.registry.ws.feature.group ${carbon.registry.version} + org.wso2.carbon.webapp.mgt.feature.group ${carbon.deployment.version} @@ -1526,6 +1522,9 @@ org.wso2.carbon.device.mgt.oauth.extensions.feature.group ${carbon.device.mgt.version} + + + org.apache.synapse.wso2.feature.group ${carbon.mediation.version} @@ -1558,6 +1557,7 @@ org.wso2.carbon.mediation.admin.feature.group ${carbon.mediation.version} + org.wso2.carbon.tenant.common.feature.group ${carbon.multitenancy.version} @@ -1592,7 +1592,7 @@ - + 5-p2-profile-generation