From 8a4b97ebf9631a2c2743a145950b554ebb7cb8b7 Mon Sep 17 00:00:00 2001
From: hasuniea <hasunie@wso2.com>
Date: Tue, 9 Aug 2016 18:00:49 +0530
Subject: [PATCH 1/8] refactoring windowsapi

---
 .../org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml   | 4 ++--
 .../pom.xml                                                 | 2 +-
 .../src/main/resources/p2.inf                               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
index 4aedb77be..98ef25353 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
@@ -46,7 +46,7 @@
                 <version>2.2</version>
                 <configuration>
                     <!--<packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes>-->
-                    <warName>${project.artifactId}</warName>
+                    <warName>api#device-mgt#windows#v1.0</warName>
                 </configuration>
             </plugin>
         </plugins>
@@ -72,7 +72,7 @@
                                     <tasks>
                                         <copy todir="${basedir}/../../../repository/deployment/server/webapps" overwrite="true">
                                             <fileset dir="${basedir}/target">
-                                                <include name="${project.artifactId}.war" />
+                                                <include name="api#device-mgt#windows#v1.0.war" />
                                             </fileset>
                                         </copy>
                                     </tasks>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
index 633bd9f20..a2d51efef 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
@@ -118,7 +118,7 @@
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${project.build.directory}/maven-shared-archive-resources/webapps/
                                     </outputDirectory>
-                                    <destFileName>mdm-windows-agent.war</destFileName>
+                                    <destFileName>api#device-mgt#windows#v1.0.war</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
index 11320712c..d70e9fe99 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/p2.inf
@@ -1,13 +1,13 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/webapps/mdm-windows-agent.war,target:${installFolder}/../../deployment/server/webapps/mdm-windows-agent.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/webapps/api#device-mgt#windows#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#device-mgt#windows#v1.0.war,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/dbscripts/plugins/,target:${installFolder}/../../../dbscripts/cdm/plugins/windows,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../database/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.mobile.windows_${feature.version}/database/,target:${installFolder}/../../database/,overwrite:true);\
 
 instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/mdm-windows-agent.war);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/mdm-windows-agent);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/api#device-mgt#windows#v1.0.war);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/api#device-mgt#windows#v1.0);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-edit);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view);\

From b9289e801f54ef934ba0549eb7e558dada7ed653 Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Thu, 11 Aug 2016 12:21:28 +0530
Subject: [PATCH 2/8] Addin carbon 4.4.7 migration changes

---
 components/iot-plugins/pom.xml                |  2 +-
 .../pom.xml                                   |  2 +-
 pom.xml                                       | 20 ++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/components/iot-plugins/pom.xml b/components/iot-plugins/pom.xml
index 283ad011f..b92b509a0 100644
--- a/components/iot-plugins/pom.xml
+++ b/components/iot-plugins/pom.xml
@@ -36,7 +36,7 @@
         <module>androidsense-plugin</module>
         <module>arduino-plugin</module>
         <module>raspberrypi-plugin</module>
-        <module>virtual-fire-alarm-plugin</module>
+        <!--module>virtual-fire-alarm-plugin</module-->
         <module>iot-base-plugin</module>
         <module>iot-analytics</module>
     </modules>
diff --git a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
index 5bd1455c0..94c09f835 100644
--- a/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
+++ b/features/iot-plugins-feature/iot-base-plugin-feature/org.wso2.carbon.device.mgt.iot.adapter.feature/pom.xml
@@ -172,7 +172,7 @@
                                     org.igniterealtime.smack.wso2:smackx:${smackx.wso2.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${identity.inbound.auth.oauth.version}
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
diff --git a/pom.xml b/pom.xml
index aa5241f92..7d016858e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1000,13 +1000,13 @@
             <dependency>
                 <groupId>org.wso2.carbon.identity</groupId>
                 <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.inbound.auth.oauth.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity</groupId>
                 <artifactId>org.wso2.carbon.identity.oauth</artifactId>
-                <version>${carbon.identity.version}</version>
+                <version>${identity.inbound.auth.oauth.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -1087,7 +1087,7 @@
         <wso2.maven.compiler.target>1.7</wso2.maven.compiler.target>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.3</carbon.kernel.version>
+        <carbon.kernel.version>4.4.7</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@@ -1130,23 +1130,25 @@
         <carbon.commons.version>4.4.8</carbon.commons.version>
 
         <!-- Carbon Deployment -->
-        <carbon.deployment.version>4.6.0</carbon.deployment.version>
+        <carbon.deployment.version>4.7.0</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.version>5.0.7</carbon.identity.version>
+        <carbon.identity.framework.version>5.2.0</carbon.identity.framework.version>
+        <identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>
         <carbon.identity.version.range>[5.0.7, 6.0.0)</carbon.identity.version.range>
 
         <!-- Carbon Multi-tenancy -->
-        <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>
+        <carbon.multitenancy.version>4.6.0</carbon.multitenancy.version>
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.4.8</carbon.registry.version>
+        <carbon.registry.version>4.6.0</carbon.registry.version>
 
         <!-- Carbon Governance -->
-        <carbon.governance.version>4.5.8</carbon.governance.version>
+        <carbon.governance.version>4.6.4</carbon.governance.version>
 
         <!-- Carbon API Management -->
-        <carbon.api.mgt.version>5.0.3</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.0.4</carbon.api.mgt.version>
 
         <!-- XMPP/MQTT Version -->
         <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>

From e9601dcbb3330b193cba13b864fba5f83a5fabe1 Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Fri, 12 Aug 2016 08:42:50 +0530
Subject: [PATCH 3/8] Fixed dependancy issues

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7d016858e..80f252789 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1142,7 +1142,7 @@
         <carbon.multitenancy.version>4.6.0</carbon.multitenancy.version>
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.6.0</carbon.registry.version>
+        <carbon.registry.version>4.5.6</carbon.registry.version>
 
         <!-- Carbon Governance -->
         <carbon.governance.version>4.6.4</carbon.governance.version>

From 2b3967fd71ca80e36d1f29aa5e1d6d31663d13fe Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Mon, 5 Sep 2016 16:39:13 +0530
Subject: [PATCH 4/8] Partial commit of migration

---
 .../org.wso2.carbon.device.mgt.mobile/pom.xml       |  2 +-
 pom.xml                                             | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
index 15706b2c0..b6c82279e 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml
@@ -58,7 +58,7 @@
                             javax.xml.bind.*,
                             javax.naming,
                             javax.sql,
-                            javax.xml.parsers,
+                            javax.xml.parsers; version=0.0.0,
                             org.w3c.dom,
                             org.wso2.carbon.context,
                             org.wso2.carbon.utils.*,
diff --git a/pom.xml b/pom.xml
index 7c8444626..3c998c4af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -623,10 +623,10 @@
                         <groupId>org.wso2.carbon</groupId>
                         <artifactId>org.wso2.carbon.identity.oauth</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.apimgt.keymgt.client</artifactId>
-                    </exclusion>
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.apimgt.keymgt.client</artifactId>-->
+                    <!--</exclusion>-->
                     <exclusion>
                         <groupId>org.apache.poi</groupId>
                         <artifactId>poi-ooxml</artifactId>
@@ -1077,6 +1077,11 @@
                 <artifactId>hibernate-validator</artifactId>
                 <version>${hibernate-validator.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.apimgt</groupId>
+                <artifactId>org.wso2.carbon.apimgt.keymgt.client</artifactId>
+                <version>${carbon.api.mgt.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 2a0b5009353b7afb56d57c1dcde3f85d48219d4c Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Wed, 14 Sep 2016 17:23:33 +0530
Subject: [PATCH 5/8] Updating to latest appm/apim/identity dependencies

---
 .../pom.xml                                   | 12 +++++++++++
 .../pom.xml                                   | 16 +++++++++------
 pom.xml                                       | 20 +++++++++----------
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
index 25f928cff..e49cc981d 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
@@ -176,6 +176,12 @@
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.analytics</groupId>
@@ -199,6 +205,12 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-jaxrs</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
index 9e8559a17..dcb03745d 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
@@ -173,13 +173,13 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
+            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
+            <artifactId>axiom</artifactId>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-impl</artifactId>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -206,11 +206,11 @@
             <artifactId>saaj-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.bouncycastle</groupId>
+            <groupId>org.bouncycastle.wso2</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.bouncycastle</groupId>
+            <groupId>org.wso2.orbit.org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
         </dependency>
         <dependency>
@@ -269,6 +269,10 @@
                     <groupId>org.wso2.carbon.identity</groupId>
                     <artifactId>org.wso2.carbon.identity.base</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 3c998c4af..27d0be33e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -912,15 +912,15 @@
                 <version>${wss4j.security.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
-                <artifactId>axiom-api</artifactId>
+                <groupId>org.apache.ws.commons.axiom.wso2</groupId>
+                <artifactId>axiom</artifactId>
                 <version>${axiom-api.version}</version>
             </dependency>
-            <dependency>
+            <!--dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-impl</artifactId>
                 <version>${axiom-api.version}</version>
-            </dependency>
+            </dependency-->
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
@@ -952,14 +952,14 @@
                 <version>${saaj-impl.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.bouncycastle</groupId>
+                <groupId>org.bouncycastle.wso2</groupId>
                 <artifactId>bcpkix-jdk15on</artifactId>
                 <version>${bcpkix-jdk15on.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.bouncycastle</groupId>
+                <groupId>org.wso2.orbit.org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>${bcpkix-jdk15on.version}</version>
+                <version>1.52.0.wso2v1</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
@@ -1092,7 +1092,7 @@
         <wso2.maven.compiler.target>1.7</wso2.maven.compiler.target>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.7</carbon.kernel.version>
+        <carbon.kernel.version>4.4.9</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@@ -1186,13 +1186,13 @@
 
         <javaee-web-api.version>6.0</javaee-web-api.version>
 
-        <axiom-api.version>1.2.14</axiom-api.version>
+        <axiom-api.version>1.2.11.wso2v10</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>
+        <bcpkix-jdk15on.version>1.52.0.wso2v1</bcpkix-jdk15on.version>
         <plexus-utils.version>3.0.21</plexus-utils.version>
         <joda-time.version>2.2</joda-time.version>
         <wss4j.security.version>1.6.17</wss4j.security.version>

From 03c0108db5e5682b3c19f273c0edc4d4b008a63e Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Tue, 20 Sep 2016 10:39:34 +0530
Subject: [PATCH 6/8] Removing unwanted dependencies from windows api

---
 .../pom.xml                                          | 12 ++++++++++++
 pom.xml                                              |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
index 7e95730a3..9b4fabc76 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
@@ -175,6 +175,7 @@
         <dependency>
             <groupId>org.apache.ws.commons.axiom.wso2</groupId>
             <artifactId>axiom</artifactId>
+            <scope>provided</scope>
         </dependency>
         <!--dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
@@ -183,6 +184,7 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -208,10 +210,12 @@
         <dependency>
             <groupId>org.bouncycastle.wso2</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.orbit.org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
@@ -232,6 +236,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -240,6 +245,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
@@ -248,10 +254,12 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.logging</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!--CDM dependancies-->
@@ -311,10 +319,12 @@
         <dependency>
             <groupId>org.wso2.tomcat</groupId>
             <artifactId>tomcat-servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
@@ -335,11 +345,13 @@
             <groupId>org.codehaus.jettison.wso2</groupId>
             <artifactId>jettison</artifactId>
             <version>1.1.wso2v1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.json.wso2</groupId>
             <artifactId>json</artifactId>
             <version>2.0.0.wso2v1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
diff --git a/pom.xml b/pom.xml
index 99edcd28c..62174b774 100644
--- a/pom.xml
+++ b/pom.xml
@@ -955,7 +955,7 @@
             <dependency>
                 <groupId>org.wso2.orbit.org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>1.52.0.wso2v1</version>
+                <version>${bcpkix-jdk15on.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>

From 282fe25b4749152b57f5e173db27cece18af1298 Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Wed, 21 Sep 2016 12:57:03 +0530
Subject: [PATCH 7/8] Fixing dependency related issues

---
 .../org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml     | 2 +-
 pom.xml                                                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
index 9b4fabc76..3285a76d1 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
@@ -208,7 +208,7 @@
             <artifactId>saaj-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.bouncycastle.wso2</groupId>
+            <groupId>org.wso2.orbit.org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 62174b774..35fbda17b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -948,7 +948,7 @@
                 <version>${saaj-impl.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.bouncycastle.wso2</groupId>
+                <groupId>org.wso2.orbit.org.bouncycastle</groupId>
                 <artifactId>bcpkix-jdk15on</artifactId>
                 <version>${bcpkix-jdk15on.version}</version>
             </dependency>
@@ -1149,7 +1149,7 @@
         <carbon.governance.version>4.6.4</carbon.governance.version>
 
         <!-- Carbon API Management -->
-        <carbon.api.mgt.version>6.0.4</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.0.5-SNAPSHOT</carbon.api.mgt.version>
 
         <!-- XMPP/MQTT Version -->
         <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>

From 2565de82e53b8ecf850235513af17b012f898edd Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Fri, 23 Sep 2016 11:25:56 +0530
Subject: [PATCH 8/8] Synching with master and updating jscep and bcpkix
 dependencies

---
 pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 61f72e066..80af5aba4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -955,7 +955,7 @@
             <dependency>
                 <groupId>org.wso2.orbit.org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>${bcpkix-jdk15on.version}</version>
+                <version>${bcprov-jdk15on.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
@@ -1149,7 +1149,7 @@
         <carbon.governance.version>4.6.4</carbon.governance.version>
 
         <!-- Carbon API Management -->
-        <carbon.api.mgt.version>6.0.5-SNAPSHOT</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.0.5</carbon.api.mgt.version>
 
         <!-- XMPP/MQTT Version -->
         <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
@@ -1188,7 +1188,8 @@
         <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.52.0.wso2v1</bcpkix-jdk15on.version>
+        <bcpkix-jdk15on.version>1.52.0.wso2v2</bcpkix-jdk15on.version>
+	    <bcprov-jdk15on.version>1.52.0.wso2v1</bcprov-jdk15on.version>
         <plexus-utils.version>3.0.21</plexus-utils.version>
         <joda-time.version>2.2</joda-time.version>
         <wss4j.security.version>1.6.17</wss4j.security.version>