Fixed build issue due to okio

revert-70aa11f8
charitha 7 years ago
parent 9623fb294a
commit bccb88ab22

@ -77,13 +77,15 @@
javax.annotation;resolution:=optional, javax.annotation;resolution:=optional,
javax.net;resolution:=optional, javax.net;resolution:=optional,
javax.security.auth.x500;resolution:=optional, javax.security.auth.x500;resolution:=optional,
okio;resolution:=optional, javax.crypto;resolution:=optional,
javax.crypto.spec;resolution:=optional
</Import-Package> </Import-Package>
<Embed-Dependency> <Embed-Dependency>
jsr311-api, jsr311-api,
feign-jaxrs, feign-jaxrs,
feign-okhttp, feign-okhttp,
okhttp okhttp,
okio
</Embed-Dependency> </Embed-Dependency>
</instructions> </instructions>
</configuration> </configuration>
@ -122,6 +124,10 @@
<groupId>com.squareup.okhttp3</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId> <artifactId>feign-okhttp</artifactId>

@ -1243,6 +1243,11 @@
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<version>${squareup.okhttp3.version}</version> <version>${squareup.okhttp3.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId> <artifactId>feign-okhttp</artifactId>
@ -1982,6 +1987,7 @@
<json.smart.version>1.3</json.smart.version> <json.smart.version>1.3</json.smart.version>
<google.gson.version>2.3.1</google.gson.version> <google.gson.version>2.3.1</google.gson.version>
<squareup.okhttp3.version>3.8.1</squareup.okhttp3.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> <github.openfeign.version>9.3.1</github.openfeign.version>
<jsr311.version>1.1.1</jsr311.version> <jsr311.version>1.1.1</jsr311.version>
<commons.logging.version>1.2</commons.logging.version> <commons.logging.version>1.2</commons.logging.version>

Loading…
Cancel
Save