diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml
index 068bc22d2f..928b346770 100644
--- a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml
+++ b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/pom.xml
@@ -61,7 +61,7 @@
                             javax.naming,
                             javax.sql,
                             javax.xml.bind.annotation.*,
-                            javax.xml.parsers,
+                            javax.xml.parsers.*;resolution:=optional,
                             org.w3c.dom,
                             org.wso2.carbon.core,
                             org.wso2.carbon.context,
diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/pom.xml b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/pom.xml
index 472a085ef2..ddbbe4bc24 100644
--- a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/pom.xml
+++ b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/pom.xml
@@ -61,7 +61,7 @@
                             javax.naming,
                             javax.sql,
                             javax.xml.bind.annotation.*,
-                            javax.xml.parsers,
+                            javax.xml.parsers.*;resolution:=optional,
                             org.w3c.dom,
                             org.wso2.carbon.core,
                             org.wso2.carbon.context,
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml
index 2ccbcb4cbc..ae9fe11847 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.api/pom.xml
@@ -39,8 +39,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
                 <version>2.3.2</version>
             </plugin>
@@ -163,10 +163,17 @@
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.axis2.wso2</groupId>
+                    <artifactId>axis2-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.axis2.wso2</groupId>
@@ -192,6 +199,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
index d997fa5a09..e0d48a9593 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
@@ -62,7 +62,7 @@
                             javax.naming,
                             javax.sql,
                             javax.xml.bind.annotation.*,
-                            javax.xml.parsers,
+                            javax.xml.parsers.*;resolution:=optional,
                             org.w3c.dom,
                             org.wso2.carbon.core,
                             org.wso2.carbon.context,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
index 3182ef8544..aff511b063 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-~
-~ WSO2 Inc. licenses this file to you under the Apache License,
-~ Version 2.0 (the "License"); you may not use this file except
-~ in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~    http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing,
-~ software distributed under the License is distributed on an
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~ KIND, either express or implied.  See the License for the
-~ specific language governing permissions and limitations
-~ under the License.
--->
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -32,7 +34,8 @@
     <version>1.9.2-SNAPSHOT</version>
     <name>WSO2 Carbon - Mobile Device Management Feature</name>
     <url>http://wso2.org</url>
-    <description>This feature contains the core bundles required for Mobile Device Management functionality
+    <description>This feature contains the core bundles required for Mobile Device Management
+        functionality
     </description>
 
     <dependencies>
@@ -48,20 +51,14 @@
             <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
             <artifactId>org.wso2.carbon.device.mgt.mobile.url.printer</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.extensions.feature</artifactId>
-            <type>zip</type>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -108,7 +105,8 @@
                                     <artifactId>org.wso2.carbon.device.mgt.mobile.api</artifactId>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${basedir}/src/main/resources/webapps/</outputDirectory>
+                                    <outputDirectory>${basedir}/src/main/resources/webapps/
+                                    </outputDirectory>
                                     <destFileName>mdm_admin.war</destFileName>
                                 </artifactItem>
                             </artifactItems>
@@ -129,21 +127,34 @@
                         </goals>
                         <configuration>
                             <id>org.wso2.carbon.device.mgt.mobile</id>
-                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <propertiesFile>../../../features/etc/feature.properties
+                            </propertiesFile>
                             <adviceFile>
                                 <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
-                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server
+                                    </propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
+                                    </propertyDef>
                                 </properties>
                             </adviceFile>
                             <bundles>
-                                <bundleDef>org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.impl:${carbon.mobile.device.mgt.version}</bundleDef>
-                                <bundleDef>org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.url.printer:${carbon.mobile.device.mgt.version}</bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.impl:${carbon.mobile.device.mgt.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.url.printer:${carbon.mobile.device.mgt.version}
+                                </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.device.mgt.extensions:${carbon.device.mgt.version}</importFeatureDef>
+                                <importFeatureDef>
+                                    org.wso2.carbon.core.server:${carbon.kernel.version}
+                                </importFeatureDef>
+                                <importFeatureDef>
+                                    org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
+                                </importFeatureDef>
+                                <importFeatureDef>
+                                    org.wso2.carbon.device.mgt.extensions:${carbon.device.mgt.version}
+                                </importFeatureDef>
                             </importFeatures>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index 8bcc8b2040..50d3752d52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- ~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -144,10 +144,6 @@
                         <groupId>org.wso2.carbon</groupId>
                         <artifactId>org.wso2.carbon.registry.api</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>xerces.wso2</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -229,24 +225,22 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
+                <artifactId>org.wso2.carbon.device.mgt.group.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+                <artifactId>org.wso2.carbon.device.mgt.group.common</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
-                <type>zip</type>
+                <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.extensions.feature</artifactId>
-                <type>zip</type>
+                <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
 
@@ -303,17 +297,6 @@
                 <version>${javax.ws.rs.version}</version>
                 <!--<scope>provided</scope>-->
             </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <scope>test</scope>
-                <version>${junit.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-httpclient.wso2</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>${orbit.version.commons-httpclient}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
@@ -326,18 +309,6 @@
                 <version>${carbon.commons.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.wso2.carbon.identity</groupId>
-                <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
-                <version>${carbon.identity.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.axis2.wso2</groupId>
-                        <artifactId>axis2-client</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <!--Osgi dependencies-->
             <dependency>
                 <groupId>org.eclipse.osgi</groupId>
@@ -380,24 +351,19 @@
                 <artifactId>h2-database-engine</artifactId>
                 <version>${orbit.h2.engine.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.wso2</groupId>
-                <artifactId>jdbc-pool</artifactId>
-                <version>${orbit.tomcat.jdbc.pooling.version}</version>
-            </dependency>
 
             <!--APIM dependencies-->
-            <!--            <dependency>
-                            <groupId>org.wso2.carbon.apimgt</groupId>
-                            <artifactId>org.wso2.carbon.apimgt.core</artifactId>
-                            <version>${carbon.api.mgt.version}</version>
-                            <exclusions>
-                                <exclusion>
-                                    <groupId>org.wso2.carbon.mediation</groupId>
-                                    <artifactId>org.wso2.carbon.mediation.initializer</artifactId>
-                                </exclusion>
-                            </exclusions>
-                        </dependency>-->
+            <dependency>
+                <groupId>org.wso2.carbon.apimgt</groupId>
+                <artifactId>org.wso2.carbon.apimgt.core</artifactId>
+                <version>${carbon.api.mgt.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.wso2.carbon</groupId>
+                        <artifactId>org.wso2.carbon.mediation.initializer</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.apimgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.api</artifactId>
@@ -415,11 +381,7 @@
                 <version>${carbon.api.mgt.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.axis2.wso2</groupId>
-                        <artifactId>axis2-client</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon.mediation</groupId>
+                        <groupId>org.wso2.carbon</groupId>
                         <artifactId>org.wso2.carbon.mediation.initializer</artifactId>
                     </exclusion>
                     <exclusion>
@@ -522,17 +484,245 @@
                         <groupId>com.googlecode.json-simple.wso2</groupId>
                         <artifactId>json-simple</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.bsf</groupId>
-                        <artifactId>bsf-all</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
 
+            <!--Windows Jax-RS dependencies-->
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-bindings-soap</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-bindings-http</artifactId>
+                <version>${cxf.bindings.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.security</groupId>
+                <artifactId>wss4j</artifactId>
+                <version>${wss4j.security.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-rs-extension-providers</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-ws-security</artifactId>
+                <version>${cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.wss4j</groupId>
+                <artifactId>wss4j-ws-security-common</artifactId>
+                <version>${wss4j.security.common.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-api</artifactId>
+                <version>${axiom-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.axiom</groupId>
+                <artifactId>axiom-impl</artifactId>
+                <version>${axiom-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-web</artifactId>
+                <version>${spring-web.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.ws</groupId>
+                <artifactId>spring-ws-security</artifactId>
+                <version>${spring-ws-security.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring-web.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-rt</artifactId>
+                <version>${jaxws-rt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.messaging.saaj</groupId>
+                <artifactId>saaj-impl</artifactId>
+                <version>${saaj-impl.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>${bcpkix-jdk15on.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>${bcpkix-jdk15on.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-utils</artifactId>
+                <version>${plexus-utils.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.madgag.spongycastle</groupId>
+                <artifactId>pkix</artifactId>
+                <version>${spongycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.madgag.spongycastle</groupId>
+                <artifactId>prov</artifactId>
+                <version>${spongycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.madgag.spongycastle</groupId>
+                <artifactId>core</artifactId>
+                <version>${spongycastle.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>joda-time</groupId>
+                <artifactId>joda-time</artifactId>
+                <version>${joda-time.version}</version>
+            </dependency>
+
+            <!-- Tomcat dependencies -->
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.tomcat.ext</artifactId>
+                <version>${carbon.kernel.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.tomcat</artifactId>
+                <version>${carbon.kernel.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.tomcat</groupId>
+                <artifactId>tomcat-servlet-api</artifactId>
+                <version>${orbit.version.tomcat-servlet-api}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.tomcat</groupId>
+                <artifactId>tomcat</artifactId>
+                <version>${orbit.tomcat.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.wso2</groupId>
+                <artifactId>jdbc-pool</artifactId>
+                <version>${orbit.tomcat.jdbc.pooling.version}</version>
+            </dependency>
+            <!-- End of Tomcat dependencies -->
+
+            <dependency>
+                <groupId>commons-httpclient.wso2</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>${orbit.version.commons-httpclient}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity</groupId>
+                <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
+                <version>${carbon.identity.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <scope>test</scope>
+                <version>${junit.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.dynamic.client.registration</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+                <version>1.9.0</version>
+            </dependency>
+
+
+            <!-- App Management feature dependencies-->
+            <dependency>
+                <groupId>org.wso2.carbon.appmgt</groupId>
+                <artifactId>org.wso2.carbon.appmgt.core.feature</artifactId>
+                <version>${appmgt..feature.version}</version>
+            </dependency>
+
+
+            <dependency>
+                <groupId>org.wso2.carbon.appmgt</groupId>
+                <artifactId>org.wso2.carbon.appmgt.feature</artifactId>
+                <version>${appmgt..feature.version}</version>
+            </dependency>
+
+
+            <!--<dependency>-->
+            <!--<groupId>org.wso2.carbon.appmgt</groupId>-->
+            <!--<artifactId>org.wso2.carbon.appmgt.interceptor.feature</artifactId>-->
+            <!--<version>${appmgt..feature.version}</version>-->
+            <!--</dependency>-->
+            <dependency>
+                <groupId>org.wso2.carbon.appmgt</groupId>
+                <artifactId>org.wso2.carbon.appmgt.mdm.wso2emm.feature</artifactId>
+                <version>${appmgt..feature.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.appmgt</groupId>
+                <artifactId>org.wso2.carbon.appmgt.mdm.wso2mdm.feature</artifactId>
+                <version>${appmgt..feature.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.appmgt</groupId>
+                <artifactId>org.wso2.carbon.appmgt.mobile.feature</artifactId>
+                <version>${appmgt..feature.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.appmgt</groupId>
+                <artifactId>org.wso2.carbon.appmgt.publisher.feature</artifactId>
+                <version>${appmgt..feature.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.appmgt</groupId>
+                <artifactId>org.wso2.carbon.appmgt.services.api.feature</artifactId>
+                <version>${appmgt..feature.version}</version>
+            </dependency>
+            <!--<dependency>-->
+            <!--<groupId>org.wso2.carbon.appmgt</groupId>-->
+            <!--<artifactId>org.wso2.carbon.appmgt.startup.publisher.feature</artifactId>-->
+            <!--<version>${appmgt..feature.version}</version>-->
+            <!--</dependency>-->
+            <dependency>
+                <groupId>org.wso2.carbon.appmgt</groupId>
+                <artifactId>org.wso2.carbon.appmgt.store.feature</artifactId>
+                <version>${appmgt..feature.version}</version>
+            </dependency>
+
+            <!-- End of app management features-->
+
+            <!-- Adding cipertool feature to the product -->
+            <dependency>
+                <groupId>org.wso2.ciphertool</groupId>
+                <artifactId>org.wso2.ciphertool</artifactId>
+                <version>${cipher.tool.version}</version>
+            </dependency>
+
             <!-- Governance dependencies -->
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -635,7 +825,7 @@
 
         <!--Testing -->
         <junit.version>4.8.2</junit.version>
-        <test.framework.version>4.3.1</test.framework.version>
+        <test.framework.version>4.4.2</test.framework.version>
         <testng.version>6.8</testng.version>
 
         <!--Eclipse Osgi-->
@@ -644,8 +834,11 @@
 
         <!--Orbit versions-->
         <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
-        <orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version>
+
+        <!-- Tomcat -->
+        <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
         <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
+        <orbit.version.tomcat-servlet-api>7.0.59.wso2v1</orbit.version.tomcat-servlet-api>
 
         <!-- CXF version -->
         <cxf.version>2.7.16</cxf.version>
@@ -685,8 +878,20 @@
         <bouncycastle.version>1.49</bouncycastle.version>
         <apache.wss4j.version>2.0.0</apache.wss4j.version>
         <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
-        <google.gson.version>2.2.4</google.gson.version>
-
+        <wss4j.security.version>1.6.17</wss4j.security.version>
+        <wss4j.security.common.version>2.0.0</wss4j.security.common.version>
+        <axiom-api.version>1.2.14</axiom-api.version>
+        <log4j.version>1.2.17</log4j.version>
+        <spring-web.version>3.0.5.RELEASE</spring-web.version>
+        <spring-ws-security.version>2.1.0.RELEASE</spring-ws-security.version>
+        <jaxws-rt.version>2.2.8</jaxws-rt.version>
+        <saaj-impl.version>1.3.18</saaj-impl.version>
+        <bcpkix-jdk15on.version>1.49</bcpkix-jdk15on.version>
+        <plexus-utils.version>3.0.21</plexus-utils.version>
+        <joda-time.version>2.2</joda-time.version>
+        <commons-io.version>2.4</commons-io.version>
+        <jsr311-api.version>1.1.1</jsr311-api.version>
+        <google.gson.version>2.3.1</google.gson.version>
     </properties>
 
     <scm>