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

Merge branch 'newAPPM' into 'application-manager-new'

Browse Source 
Merge with latest app manager dev source

See merge request entgra/product-iots!6
merge-requests/11/head
Inosh Perara 6 years ago
parent 0dc1b1623b 715ca227cc
commit 2659fbad76
2 changed files with 4 additions and 72 deletions
Show Stats Download Patch File Download Diff File

68
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -501,9 +501,6 @@
<!-- New App Manager Features--> <!-- New App Manager Features-->
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
@ -992,11 +989,6 @@
<!-- New App Manager Features--> <!-- New App Manager Features-->
<feature>
<id>org.wso2.carbon.device.application.mgt.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.application.mgt.api.feature.group</id> <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2046,72 +2038,17 @@
<version>${project.version}</version> <version>${project.version}</version>
</feature> </feature>
<!-- End of IoTServer Features --> <!-- End of IoTServer Features -->
<!-- App management features-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.mobile.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.services.api.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>-->
<!--<version>${carbon.device.mgt.plugin.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>-->
<!--<version>${carbon.device.mgt.plugin.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.rest.api.publisher.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.oauth.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<!-- End of app management features-->
<!-- New App Manager Features-->
<!--<feature>-->
<!--<id>org.wso2.carbon.device.application.mgt.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.device.application.mgt.api.feature.group</id> <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.device.application.mgt.publisher.ui.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.device.application.mgt.server.feature.group</id> <id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.device.application.mgt.store.ui.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<!-- End of New App Manager Features--> <!-- End of New App Manager Features-->
<!-- Dashboard Features --> <!-- Dashboard Features -->
@ -2736,11 +2673,6 @@
<!-- New App Manager Features--> <!-- New App Manager Features-->
<feature>
<id>org.wso2.carbon.device.application.mgt.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.application.mgt.api.feature.group</id> <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>

8
pom.xml
Unescape View File

@ -1269,7 +1269,7 @@
<!-- Dependencies for login ui --> <!-- Dependencies for login ui -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>${servlet-api.version}</version> <version>${servlet-api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -1528,14 +1528,14 @@
<carbon.governance.version>4.7.23</carbon.governance.version> <carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>3.2.1-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>3.2.2-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.2.1-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.2.2-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.2.201</carbon.api.mgt.version> <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>
@ -1556,7 +1556,7 @@
<orbit.tomcat.version>7.0.85.wso2v1</orbit.tomcat.version> <orbit.tomcat.version>7.0.85.wso2v1</orbit.tomcat.version>
<orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version> <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
<orbit.version.tomcat-servlet-api>7.0.85.wso2v1</orbit.version.tomcat-servlet-api> <orbit.version.tomcat-servlet-api>7.0.85.wso2v1</orbit.version.tomcat-servlet-api>
<servlet-api.version>2.4</servlet-api.version> <servlet-api.version>4.0.1</servlet-api.version>
<!-- Rampart --> <!-- Rampart -->
<rampart.version>1.6.1-wso2v12</rampart.version> <rampart.version>1.6.1-wso2v12</rampart.version>

Write Preview
Loading…
Cancel
Save