community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	modules/p2-profile-gen/pom.xml
This commit is contained in:
charithag 2015-07-23 10:09:17 +05:30
commit 54a4bc4961
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/p2-profile-gen/pom.xml
View File

@ -114,9 +114,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.user.server.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
@ -345,10 +342,6 @@
<id>org.wso2.carbon.device.mgt.user.server.feature.group</id> <id>org.wso2.carbon.device.mgt.user.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.group.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id> <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>

11
pom.xml
View File

@ -352,16 +352,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.user.common</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.user.core</artifactId>
<version>${carbon.device.mgt.version}</version>
</dependency>
<!--IOT dependencies--> <!--IOT dependencies-->