From bccb88ab22dac0912f9099a83ec85a99922872aa Mon Sep 17 00:00:00 2001
From: charitha <charithag@wso2.com>
Date: Sat, 7 Jul 2018 09:23:44 +0530
Subject: [PATCH] Fixed build issue due to okio

---
 .../org.wso2.carbon.apimgt.integration.client/pom.xml  | 10 ++++++++--
 pom.xml                                                |  6 ++++++
 2 files changed, 14 insertions(+), 2 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 64a849c767..1ce1b4df31 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
@@ -77,13 +77,15 @@
 							javax.annotation;resolution:=optional,
 							javax.net;resolution:=optional,
 							javax.security.auth.x500;resolution:=optional,
-							okio;resolution:=optional,
+							javax.crypto;resolution:=optional,
+							javax.crypto.spec;resolution:=optional
 						</Import-Package>
 						<Embed-Dependency>
 							jsr311-api,
 							feign-jaxrs,
 							feign-okhttp,
-							okhttp
+							okhttp,
+							okio
 						</Embed-Dependency>
 					</instructions>
 				</configuration>
@@ -122,6 +124,10 @@
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.squareup.okio</groupId>
+			<artifactId>okio</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>io.github.openfeign</groupId>
 			<artifactId>feign-okhttp</artifactId>
diff --git a/pom.xml b/pom.xml
index d7c50f7fae..69b843008a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1243,6 +1243,11 @@
                 <artifactId>okhttp</artifactId>
                 <version>${squareup.okhttp3.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio</artifactId>
+                <version>${okio.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.github.openfeign</groupId>
                 <artifactId>feign-okhttp</artifactId>
@@ -1982,6 +1987,7 @@
         <json.smart.version>1.3</json.smart.version>
         <google.gson.version>2.3.1</google.gson.version>
         <squareup.okhttp3.version>3.8.1</squareup.okhttp3.version>
+        <okio.version>1.13.0</okio.version>
         <github.openfeign.version>9.3.1</github.openfeign.version>
         <jsr311.version>1.1.1</jsr311.version>
         <commons.logging.version>1.2</commons.logging.version>