Adding the changes for the app manager

6 years ago · 18c3ee23b9
parent 34fad87cce
commit 18c3ee23b9
18 changed files with 79 additions and 104 deletions
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.authhandler/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.authhandler/pom.xml
@ -24,11 +24,11 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
    </parent>

    <artifactId>org.wso2.carbon.device.application.mgt.authhandler</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>WSO2 Carbon - Application Management Authentication Handler API</name>
    <description>Proxy Service for Authentication Handling in WSO2 App Manager.</description>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml
@ -21,13 +21,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.common</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>bundle</packaging>
    <name>WSO2 Carbon - Application Management Common</name>
    <description>WSO2 Carbon - Application Management Common</description>
@ -51,21 +51,8 @@
                        <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
                        <Bundle-Description>Application Management Common Bundle</Bundle-Description>
                        <Import-Package>
-                            org.osgi.framework,
-                            org.osgi.service.component,
-                            org.apache.commons.logging,
-                            javax.xml.*,
-                            org.apache.commons.codec.binary;version="${commons-codec.wso2.osgi.version.range}",
-                            org.wso2.carbon.device.mgt.core.dto.*;version="${carbon.device.mgt.version}",
-                            org.wso2.carbon.device.mgt.core.dao.*;version="${carbon.device.mgt.version}",
                            org.wso2.carbon.device.mgt.common.operation.mgt.*;version="${carbon.device.mgt.version}",
-                            org.w3c.dom,
-                            org.json,
-                            org.xml.sax,
                            com.google.gson,
-                            javax.naming,
-                            javax.xml.bind.annotation,
-                            javax.xml.bind,
                            io.swagger.annotations.*;resolution:=optional
                        </Import-Package>
                        <Export-Package>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
@ -21,13 +21,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>bundle</packaging>
    <name>WSO2 Carbon - Application Management Core</name>
    <description>WSO2 Carbon - Application Management Core</description>
@ -57,7 +57,6 @@
                            org.osgi.framework,
                            org.osgi.service.component,
                            org.apache.commons.logging,
-                            javax.xml.*,
                            javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
                            org.wso2.carbon.context.*,
                            org.wso2.carbon.utils.*,
@ -71,35 +70,26 @@
                            org.wso2.carbon.device.application.mgt.common.*,
                            org.wso2.carbon.device.mgt.core.*,
                            org.wso2.carbon.device.mgt.common.*,
-                            org.apache.axis2.*,
                            org.wso2.carbon.user.core.*,
                            org.wso2.carbon.user.api.*,
                            org.wso2.carbon.ndatasource.core,
                            org.wso2.carbon,
                            javax.annotation,
-                            org.bouncycastle.cert,
-                            org.bouncycastle.cert.jcajce,
-                            org.bouncycastle.cms,
-                            org.bouncycastle.jce.provider,
-                            org.bouncycastle.util,
                            org.xml.sax,
                            org.xml.sax.helpers,
                            org.apache.commons.io,
                            org.apache.commons.codec.binary;version="${commons-codec.wso2.osgi.version.range}",
                            org.apache.commons.codec.digest;version="${commons-codec.wso2.osgi.version.range}",
                            org.wso2.carbon.base,
-                            org.wso2.carbon.device.mgt.core.dto.*;version="${carbon.device.mgt.version}",
-                            org.wso2.carbon.device.mgt.core.dao.*;version="${carbon.device.mgt.version}",
-                            net.dongliu.*
+                            net.dongliu.apk.parser.*
                        </Import-Package>
                        <Embed-Dependency>apk-parser;scope=compile|runtime;inline=false</Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Embed-StripGroup>true</Embed-StripGroup>
+                        <!--<Embed-Transitive>true</Embed-Transitive>-->
+                        <!--<Embed-StripGroup>true</Embed-StripGroup>-->
                        <Export-Package>
                            !org.wso2.carbon.device.application.mgt.core.internal.*,
                            org.wso2.carbon.device.application.mgt.core.*
                        </Export-Package>
-                        <Axis2Deployer>PlatformDeployer</Axis2Deployer>
                    </instructions>
                </configuration>
            </plugin>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java
@ -23,12 +23,12 @@ import com.dd.plist.NSDictionary;
 import com.dd.plist.NSString;
 import com.dd.plist.PropertyListFormatException;
 import com.dd.plist.PropertyListParser;
-import net.dongliu.apk.parser.ApkFile;
 import net.dongliu.apk.parser.bean.ApkMeta;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.commons.validator.routines.UrlValidator;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.application.mgt.common.ApplicationRelease;
 import org.wso2.carbon.device.application.mgt.common.ApplicationType;
@ -41,16 +41,10 @@ import org.wso2.carbon.device.application.mgt.core.util.ArtifactsParser;
 import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil;
 import org.wso2.carbon.device.application.mgt.core.util.Constants;
 import org.wso2.carbon.device.application.mgt.core.util.StorageManagementUtil;
-import org.apache.commons.validator.routines.UrlValidator;
 import org.xml.sax.SAXException;

-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.*;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
@ -59,8 +53,6 @@ import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;

-import javax.xml.parsers.ParserConfigurationException;
-
 import static org.wso2.carbon.device.application.mgt.core.util.StorageManagementUtil.deleteDir;
 import static org.wso2.carbon.device.application.mgt.core.util.StorageManagementUtil.saveFile;

--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <artifactId>application-mgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.publisher.api</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>WSO2 Carbon - Application Management API</name>
    <description>WSO2 Carbon - Application Management API</description>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/pom.xml
@ -22,12 +22,12 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <name>WSO2 Carbon - Application Management Publisher UI</name>
    <description>WSO2 Carbon - Application Management Publisher UI React Application</description>
    <url>http://wso2.org</url>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <artifactId>application-mgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.store.api</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>WSO2 Carbon - Application Management API</name>
    <description>WSO2 Carbon - Application Management API</description>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/pom.xml
@ -24,10 +24,10 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
    </parent>
    <artifactId>org.wso2.carbon.device.application.mgt.store.ui</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>

    <dependencies>
    </dependencies>
--- a/components/application-mgt/pom.xml
+++ b/components/application-mgt/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>application-mgt</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Component</name>
    <description>WSO2 Carbon - Application Management Component</description>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management API Feature</name>
    <url>http://wso2.org</url>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf
@ -1,8 +1,4 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application
-.mgt.api_${feature.version}/webapps/api#application-mgt-publisher#v1.0.war,target:${installFolder}/../.
-./deployment/server/webapps/api#application-mgt-publisher#v1.0.war,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application
-.mgt.api_${feature.version}/webapps/api#application-mgt-store#v1.0.war,target:${installFolder}/../.
-./deployment/server/webapps/api#application-mgt-store#v1.0.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.api_${feature.version}/webapps/api#application-mgt-publisher#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-publisher#v1.0.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.api_${feature.version}/webapps/api#application-mgt-store#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-store#v1.0.war,overwrite:true);\
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.auth.handler.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.auth.handler.feature/pom.xml
@ -22,12 +22,12 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.auth.handler.feature</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Authentication Handler Feature</name>
    <description>This feature contains the Authentication Handler implementation for Publisher and Store.</description>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.extensions.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.extensions.feature/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.0.46-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.extensions.feature</artifactId>
    <packaging>pom</packaging>
-    <version>3.0.46-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <name>WSO2 Carbon - Application Management Extension Feature</name>
    <url>http://wso2.org</url>
    <description>WSO2 Application Management Extension Feature</description>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.feature</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Aggregate Feature</name>
    <url>http://wso2.org</url>
@ -45,14 +45,14 @@
            <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui.feature</artifactId>
            <type>zip</type>
        </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>javax.servlet.jsp-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.orbit.org.scannotation</groupId>
-            <artifactId>scannotation</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>javax.servlet.jsp</groupId>-->
+            <!--<artifactId>javax.servlet.jsp-api</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.wso2.orbit.org.scannotation</groupId>-->
+            <!--<artifactId>scannotation</artifactId>-->
+        <!--</dependency>-->
    </dependencies>

    <build>
@ -79,10 +79,10 @@
                                <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}</includedFeatureDef>
                                <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version}</includedFeatureDef>
                            </includedFeatures>
-                            <bundles>
-                                <bundleDef>javax.servlet.jsp:javax.servlet.jsp-api</bundleDef>
-                            	<bundleDef>org.wso2.orbit.org.scannotation:scannotation:${scannotation.version}</bundleDef>
-							</bundles>
+                            <!--<bundles>-->
+                                <!--<bundleDef>javax.servlet.jsp:javax.servlet.jsp-api</bundleDef>-->
+                            	<!--<bundleDef>org.wso2.orbit.org.scannotation:scannotation:${scannotation.version}</bundleDef>-->
+							<!--</bundles>-->
                        </configuration>
                    </execution>
                </executions>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui.feature</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Publisher UI Feature</name>
    <url>http://wso2.org</url>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.server.feature</artifactId>
    <packaging>pom</packaging>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <name>WSO2 Carbon - Application Management Server Feature</name>
    <url>http://wso2.org</url>
    <description>This feature contains the core bundles required for Back-end Application Management functionality
@ -44,16 +44,24 @@
            <groupId>org.wso2.carbon.devicemgt</groupId>
            <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.auth.handler.feature</artifactId>
-            <type>zip</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>javax.servlet.jsp</groupId>-->
+            <!--<artifactId>javax.servlet.jsp-api</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.wso2.orbit.org.scannotation</groupId>-->
+            <!--<artifactId>scannotation</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+            <!--<artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>-->
+            <!--<type>zip</type>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
+            <!--<artifactId>org.wso2.carbon.device.application.mgt.auth.handler.feature</artifactId>-->
+            <!--<type>zip</type>-->
+        <!--</dependency>-->
    </dependencies>

    <build>
@ -103,10 +111,10 @@
                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
                                </properties>
                            </adviceFile>
-                            <includedFeatures>
-                                <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}</includedFeatureDef>
-                                <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.auth.handler.feature:${carbon.device.mgt.version}</includedFeatureDef>
-                            </includedFeatures>
+                            <!--<includedFeatures>-->
+                                <!--<includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}</includedFeatureDef>-->
+                                <!--<includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.auth.handler.feature:${carbon.device.mgt.version}</includedFeatureDef>-->
+                            <!--</includedFeatures>-->
                            <bundles>
                                <bundleDef>
                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.common:${carbon.device.mgt.version}
@ -114,12 +122,14 @@
                                <bundleDef>
                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.core:${carbon.device.mgt.version}
                                </bundleDef>
+                                <!--<bundleDef>javax.servlet.jsp:javax.servlet.jsp-api</bundleDef>-->
+                                <!--<bundleDef>org.wso2.orbit.org.scannotation:scannotation:${scannotation.version}</bundleDef>-->
                            </bundles>
                            <importBundles>
                            </importBundles>
-                            <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
-                            </importFeatures>
+                            <!--<importFeatures>-->
+                                <!--<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>-->
+                            <!--</importFeatures>-->
                        </configuration>
                    </execution>
                </executions>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml
@ -23,12 +23,12 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.store.ui.feature</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Store UI Feature</name>
    <url>http://wso2.org</url>
--- a/features/application-mgt/pom.xml
+++ b/features/application-mgt/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>3.1.34-SNAPSHOT</version>
+        <version>3.1.40-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>application-mgt-feature</artifactId>
-    <version>3.1.34-SNAPSHOT</version>
+    <version>3.1.40-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Feature</name>
    <url>http://wso2.org</url>