From 636e71883cf368282363da1d8a1f2625e6b67257 Mon Sep 17 00:00:00 2001
From: charitha <charithag@wso2.com>
Date: Fri, 6 Jul 2018 22:40:07 +0530
Subject: [PATCH] Fixed build issue due to okhttp

---
 .../pom.xml                                         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
index 2feaadeb14..64a849c767 100644
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
@@ -72,13 +72,18 @@
 							javax.xml,
 							org.wso2.carbon.base,
 							javax.net.ssl,
-							feign.okhttp; version=${github.openfeign.version},
-							okhttp3,
-							org.apache.commons.lang
+							org.apache.commons.lang,
+							android.util;resolution:=optional,
+							javax.annotation;resolution:=optional,
+							javax.net;resolution:=optional,
+							javax.security.auth.x500;resolution:=optional,
+							okio;resolution:=optional,
 						</Import-Package>
 						<Embed-Dependency>
 							jsr311-api,
-							feign-jaxrs
+							feign-jaxrs,
+							feign-okhttp,
+							okhttp
 						</Embed-Dependency>
 					</instructions>
 				</configuration>