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] 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 25f928cff1..e49cc981dd 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 9e8559a176..dcb03745d4 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 3c998c4af6..27d0be33ea 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>