turcy
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing build problems

Browse Source
revert-dabc3590
Geeth Munasinghe 10 years ago
parent ff859eaf19
commit e29d863a2e
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File

12
features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
Unescape View File

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

2
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
Unescape View File

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

2
features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
Unescape View File

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

2
pom.xml
Unescape View File

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

16
product/modules/p2-profile-gen/pom.xml
Unescape View File

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

Write Preview
Loading…
Cancel
Save