From 9e72e72ef4740cc4c0f9bf4bc61ba92c2327af46 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Mon, 14 Nov 2016 19:56:34 +0100
Subject: [PATCH] Update to OkHttp 3.6.0.

---
 core/pom.xml                                              | 8 ++++----
 core/src/main/java/org/bitcoinj/core/PeerGroup.java       | 2 ++
 .../java/org/bitcoinj/net/discovery/HttpDiscovery.java    | 6 +++++-
 .../org/bitcoinj/net/discovery/MultiplexingDiscovery.java | 3 ++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index c422d551d..dfd04184f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -213,8 +213,8 @@
                                         <urn>org.hamcrest:hamcrest-core:1.3:jar:null:test:42a25dc3219429f0e5d060061f71acb49bf010a0</urn>
                                         <urn>org.jacoco:jacoco-maven-plugin:0.7.5.201505241946:maven-plugin:null:runtime:0a5e4dbbcd9b00e5ee42d928e10ab84f6f0b0835</urn>
                                         <urn>org.objenesis:objenesis:1.2:jar:null:test:bfcb0539a071a4c5a30690388903ac48c0667f2a</urn>
-                                        <urn>com.squareup.okhttp:okhttp:2.7.5:jar:null:runtime:7a15a7db50f86c4b64aa3367424a60e3a325b8f1</urn>
-                                        <urn>com.squareup.okio:okio:1.6.0:jar:null:runtime:98476622f10715998eacf9240d6b479f12c66143</urn>
+                                        <urn>com.squareup.okhttp3:okhttp:3.6.0:jar:null:runtime:69edde9fc4b01c9fd51d25b83428837478c27254</urn>
+                                        <urn>com.squareup.okio:okio:1.11.0:jar:null:runtime:840897fcd7223a8143f1d9b6f69714e7be34fd50</urn>
                                         <urn>org.slf4j:slf4j-api:1.7.20:jar:null:compile:867d63093eff0a0cb527bf13d397d850af3dcae3</urn>
                                         <urn>org.slf4j:slf4j-jdk14:1.7.20:jar:null:test:b568c92eec50edc922c52b3e759982579170c2be</urn>
                                         <urn>org.sonatype.plugins:nexus-staging-maven-plugin:1.6.5:maven-plugin:null:runtime:455ca2aa8cd14a06608f1538bd6a1efd09561563</urn>
@@ -427,9 +427,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp</groupId>
+            <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>2.7.5</version>
+            <version>3.6.0</version>
         </dependency>
     </dependencies>
 
diff --git a/core/src/main/java/org/bitcoinj/core/PeerGroup.java b/core/src/main/java/org/bitcoinj/core/PeerGroup.java
index cac0d393d..4c9c3421e 100644
--- a/core/src/main/java/org/bitcoinj/core/PeerGroup.java
+++ b/core/src/main/java/org/bitcoinj/core/PeerGroup.java
@@ -43,6 +43,8 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
 
+import okhttp3.OkHttpClient;
+
 import static com.google.common.base.Preconditions.*;
 
 /**
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java
index f46b07113..5607cb77a 100644
--- a/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java
+++ b/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java
@@ -19,7 +19,6 @@ package org.bitcoinj.net.discovery;
 
 import com.google.common.annotations.*;
 import com.google.protobuf.*;
-import com.squareup.okhttp.*;
 import org.bitcoin.crawler.*;
 import org.bitcoinj.core.*;
 import org.slf4j.*;
@@ -32,6 +31,11 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.zip.*;
 
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
 import static com.google.common.base.Preconditions.*;
 
 /**
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java
index fbd003954..158e312f3 100644
--- a/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java
+++ b/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java
@@ -18,7 +18,6 @@
 package org.bitcoinj.net.discovery;
 
 import com.google.common.collect.Lists;
-import com.squareup.okhttp.OkHttpClient;
 
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.VersionMessage;
@@ -34,6 +33,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.*;
 
+import okhttp3.OkHttpClient;
+
 import static com.google.common.base.Preconditions.checkArgument;
 
 /**