community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server

Browse Source
merge-requests/1/head
menaka 9 years ago
parent efe53204c8 85bc5bd201
commit 1c0242fe7e
3 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File

3
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -388,6 +388,9 @@
</directory> </directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/
</outputDirectory> </outputDirectory>
<excludes>
<exclude>appmoauth2.war</exclude>
</excludes>
<filtered>false</filtered> <filtered>false</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</fileSet> </fileSet>

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

@ -439,7 +439,7 @@
<!-- App Manager features--> <!-- App Manager features-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>--> <!--<featureArtifactDef>-->
@ -447,23 +447,23 @@
<!--</featureArtifactDef>--> <!--</featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
@ -471,12 +471,12 @@
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <!--<featureArtifactDef>-->
org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version} <!--org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
@ -1218,11 +1218,12 @@
<feature> <feature>
<id>org.wso2.carbon.appmgt.core.feature.group</id> <id>org.wso2.carbon.appmgt.core.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<!--<feature>--> <!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.core.feature.group</id>--> <!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
<!--<version>${appmgt..feature.version}</version>--> <!--<version>${appmgt.feature.version}</version>-->
<!--</feature>--> <!--</feature>-->
@ -1233,37 +1234,37 @@
<feature> <feature>
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mdm.wso2mdm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2mdm.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id> <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.publisher.feature.group</id> <id>org.wso2.carbon.appmgt.publisher.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.services.api.feature.group</id> <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.store.feature.group</id> <id>org.wso2.carbon.appmgt.store.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<!-- End of app management features--> <!-- End of app management features-->
<feature> <!--<feature>-->
<id>org.wso2.carbon.social.feature.group</id> <!--<id>org.wso2.carbon.social.feature.group</id>-->
<version>${carbon.store.version}</version> <!--<version>${carbon.store.version}</version>-->
</feature> <!--</feature>-->
<!-- Cipher tool feature --> <!-- Cipher tool feature -->
<feature> <feature>

18
pom.xml
Unescape View File

@ -909,49 +909,49 @@
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.core.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.core.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.mdm.wso2emm.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.mdm.wso2emm.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.mdm.wso2mdm.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.mdm.wso2mdm.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.mobile.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.mobile.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.publisher.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.publisher.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.services.api.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.services.api.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.store.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.store.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
@ -1103,7 +1103,7 @@
<google.gson.version>2.3.1</google.gson.version> <google.gson.version>2.3.1</google.gson.version>
<!-- App manager version--> <!-- App manager version-->
<appmgt..feature.version>1.1.1</appmgt..feature.version> <appmgt.feature.version>1.1.1</appmgt.feature.version>
<carbon.appmgt.version>1.1.1</carbon.appmgt.version> <carbon.appmgt.version>1.1.1</carbon.appmgt.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->

Write Preview
Loading…
Cancel
Save