From 6f5720086413b5504ca2e8416c2f68ad4ab29410 Mon Sep 17 00:00:00 2001
From: Kamidu Sachith <sachithp@wso2.com>
Date: Wed, 9 Dec 2015 14:40:33 +0530
Subject: [PATCH 1/4] Hanlde dependancy in dynamic client registration by
 removing recursive dependancy

---
 .../dynamic-client-web/pom.xml                     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml b/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
index 4db2c17fcb7..d5e0ed76dbf 100644
--- a/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
+++ b/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
@@ -63,8 +63,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom.wso2</groupId>
+            <artifactId>axiom</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

From 865f5a500e9805cd1a973101576e038dbacf6582 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Wed, 9 Dec 2015 20:02:58 +0530
Subject: [PATCH 2/4] Fixing the build failure due to neethi bundle being
 plugged in to web app lib folder

---
 .../dynamic-client-web/pom.xml                         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml b/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
index 4db2c17fcb7..e4d5c62f7e2 100644
--- a/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
+++ b/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
@@ -134,6 +134,16 @@
             <groupId>org.wso2.carbon.identity</groupId>
             <artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.neethi.wso2</groupId>
+                    <artifactId>neethi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.neethi</groupId>
+                    <artifactId>neethi</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple.wso2</groupId>

From 49ae3298f4ee6d0ba4935d69ca72fb2b985b7cd4 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Wed, 9 Dec 2015 20:06:28 +0530
Subject: [PATCH 3/4] Fixing the build failure due to neethi bundle being
 plugged in to web app lib folder

---
 .../dynamic-client-web/pom.xml                       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml b/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
index 39c0b8524cc..9df732403c0 100644
--- a/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
+++ b/components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
@@ -160,6 +160,18 @@
             <artifactId>json-simple</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.neethi.wso2</groupId>
+            <artifactId>neethi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>

From 5e40035c4bfdd4d3c78764404877afaa69319f76 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Wed, 9 Dec 2015 20:26:08 +0530
Subject: [PATCH 4/4] Fixing the build failure - forgot to commit to this file

---
 pom.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pom.xml b/pom.xml
index d041463e527..408d0662487 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1247,6 +1247,19 @@
                 <artifactId>gson</artifactId>
                 <version>${google.gson.version}</version>
             </dependency>
+
+            <!-- Removing neethi configs-->
+
+            <dependency>
+                <groupId>org.apache.neethi.wso2</groupId>
+                <artifactId>neethi</artifactId>
+                <version>${neethi.wso2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.neethi</groupId>
+                <artifactId>neethi</artifactId>
+                <version>${neethi.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1543,6 +1556,10 @@
         <jsr311.version>1.1.1</jsr311.version>
         <commons.logging.version>1.2</commons.logging.version>
 
+        <!-- Neethi version-->
+        <neethi.version>2.0.4</neethi.version>
+        <neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version>
+
 	<!-- Release plugin ID for github-->
 	<project.scm.id>github-scm</project.scm.id>
     </properties>