From 00def7aecf475380cae291b88aa5f8f95f9625c3 Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Wed, 11 Jul 2018 07:00:22 +0100
Subject: [PATCH] Avoid hard conscrypt dep (#4128)

---
 okhttp-dnsoverhttps/pom.xml | 2 +-
 okhttp-tests/pom.xml        | 1 -
 okhttp/pom.xml              | 1 -
 pom.xml                     | 7 ++++++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/okhttp-dnsoverhttps/pom.xml b/okhttp-dnsoverhttps/pom.xml
index 6e00c30b0..929d022b2 100644
--- a/okhttp-dnsoverhttps/pom.xml
+++ b/okhttp-dnsoverhttps/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.conscrypt</groupId>
       <artifactId>conscrypt-openjdk-uber</artifactId>
-      <version>1.1.0</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/okhttp-tests/pom.xml b/okhttp-tests/pom.xml
index db482eb3b..daa8f7f95 100644
--- a/okhttp-tests/pom.xml
+++ b/okhttp-tests/pom.xml
@@ -47,7 +47,6 @@
     <dependency>
       <groupId>org.conscrypt</groupId>
       <artifactId>conscrypt-openjdk-uber</artifactId>
-      <version>1.0.1</version>
     </dependency>
 
     <dependency>
diff --git a/okhttp/pom.xml b/okhttp/pom.xml
index f1b60ea16..6c1a0ba9d 100644
--- a/okhttp/pom.xml
+++ b/okhttp/pom.xml
@@ -20,7 +20,6 @@
     <dependency>
       <groupId>org.conscrypt</groupId>
       <artifactId>conscrypt-openjdk-uber</artifactId>
-      <version>1.1.3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 3bd5dab3e..bde9fbecf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
     <moshi.version>1.1.0</moshi.version>
     <jnr-unixsocket.version>0.19</jnr-unixsocket.version>
     <okio.version>1.14.0</okio.version>
+    <conscrypt.version>1.1.4</conscrypt.version>
 
     <!-- Test Dependencies -->
     <junit.version>4.12</junit.version>
@@ -136,6 +137,11 @@
         <artifactId>jnr-unixsocket</artifactId>
         <version>${jnr-unixsocket.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.conscrypt</groupId>
+        <artifactId>conscrypt-openjdk-uber</artifactId>
+        <version>${conscrypt.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -353,7 +359,6 @@
         <dependency>
           <groupId>org.conscrypt</groupId>
           <artifactId>conscrypt-openjdk-uber</artifactId>
-          <version>1.1.3</version>
         </dependency>
       </dependencies>
     </profile>