removing the common-api feature from the build

merge-requests/1/head
Shabirmean 9 years ago
parent c8739494c8
commit 808771056c

@ -1094,45 +1094,45 @@
<fileMode>644</fileMode>
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/device-mgt-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicemgt-config.xml-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
<!--<filtered>true</filtered>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/device-mgt-config.xsd
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicemgt-config.xsd-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
<!--<filtered>true</filtered>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/device-type-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicetype-config.xml-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
<!--<filtered>true</filtered>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/device-type-config.xsd
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!--<file>-->
<!--<source>-->
<!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicetype-config.xsd-->
<!--</source>-->
<!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
<!--<filtered>true</filtered>-->
<!--<fileMode>644</fileMode>-->
<!--</file>-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/devicemgt-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
<filtered>true</filtered>
@ -1141,7 +1141,7 @@
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/devicecloud-config.xsd
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/devicemgt-config.xsd
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
<filtered>true</filtered>
@ -1150,7 +1150,7 @@
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/devicetype-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
<filtered>true</filtered>
@ -1159,7 +1159,7 @@
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xsd
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/devicetype-config.xsd
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/iot</outputDirectory>
<filtered>true</filtered>

@ -144,9 +144,9 @@
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.common.api.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.common.api.feature:${carbon.device.mgt.version}-->
<!--</featureArtifactDef>-->
<!-- End of Device Management Features -->
<!-- Mobile Device Management Features -->
@ -485,6 +485,7 @@
<!-- End of app manager feature-->
<!-- Cipher tools feature -->
<featureArtifactDef>
org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher.tool.version}
</featureArtifactDef>
@ -832,9 +833,7 @@
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>
org.wso2.carbon.dynamic.client.registration.server.feature.group
</id>
<id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
@ -842,21 +841,19 @@
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group
</id>
<id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.devicemgt.ui.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.device.mgt.common.api.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.device.mgt.common.api.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.server.feature.group
</id>
<id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<!-- End of Device Management Features -->
@ -866,9 +863,7 @@
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>
org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group
</id>
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
@ -1262,14 +1257,15 @@
<id>org.wso2.carbon.appmgt.store.feature.group</id>
<version>${appmgt..feature.version}</version>
</feature>
<!-- End of app management features-->
<feature>
<id>org.wso2.carbon.social.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<!-- Cipher tool feature -->
<feature>
<id>org.wso2.ciphertool.feature.group</id>
<version>${cipher.tool.version}</version>

Loading…
Cancel
Save