Fixing build problems

merge-requests/7/head
Geeth Munasinghe 10 years ago
parent ff859eaf19
commit e29d863a2e

@ -39,13 +39,13 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile.impl</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>
</dependencies>
<build>
@ -98,13 +98,13 @@
<bundles>
<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.impl:${project.version}
</bundleDef>
<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version}
<bundleDef>org.wso2.carbon:org.wso2.carbon.device.mgt.common:${project.version}
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
</importFeatureDef>
<importFeatureDef>org.wso2.carbon.device.mgt.server:${project.version}
<importFeatureDef>org.wso2.carbon.device.mgt.server:${project.version}
</importFeatureDef>
</importFeatures>
</configuration>

@ -112,7 +112,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
</importFeatureDef>
</importFeatures>
</configuration>

@ -112,7 +112,7 @@
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.platform.version}
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
</importFeatureDef>
</importFeatures>
</configuration>

@ -247,7 +247,7 @@
<properties>
<testng.version>6.1.1</testng.version>
<carbon.kernel.version>4.3.0-SNAPSHOT</carbon.kernel.version>
<carbon.kernel.version>4.3.0</carbon.kernel.version>
<carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>

@ -133,9 +133,9 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
<!--<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.dbconsole.ui.feature:${carbon.platform.version}
</featureArtifactDef>
</featureArtifactDef>-->
<!-- API Manager related features -->
<featureArtifactDef>
@ -180,6 +180,9 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.platform.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.version}
</featureArtifactDef>
@ -318,6 +321,11 @@
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.platform.version}</version>
@ -340,10 +348,10 @@
<id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
<feature>
<!--<feature>
<id>org.wso2.carbon.dbconsole.ui.feature.group</id>
<version>${carbon.platform.version}</version>
</feature>
</feature>-->
</features>
</configuration>
</execution>

Loading…
Cancel
Save