From 8aca46e53f5962217851dc2103211f99a4ef7258 Mon Sep 17 00:00:00 2001
From: John Zhuge <jzhuge@cloudera.com>
Date: Wed, 13 Sep 2017 20:36:31 -0700
Subject: [PATCH] HADOOP-14651. Update okhttp version to 2.7.5. Contributed by
 Ray Chiang and John Zhuge.

---
 hadoop-project/pom.xml                     | 3 ++-
 hadoop-tools/hadoop-azure-datalake/pom.xml | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 915bd4e9bf4..66d2eb4cef3 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -102,6 +102,7 @@
     <ehcache.version>3.3.1</ehcache.version>
     <hikari.version>2.4.12</hikari.version>
     <mssql.version>6.2.1.jre7</mssql.version>
+    <okhttp.version>2.7.5</okhttp.version>
 
     <!-- define the Java language version used by the compiler -->
     <javac.version>1.8</javac.version>
@@ -147,7 +148,7 @@
       <dependency>
         <groupId>com.squareup.okhttp</groupId>
         <artifactId>okhttp</artifactId>
-        <version>2.4.0</version>
+        <version>${okhttp.version}</version>
       </dependency>
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
diff --git a/hadoop-tools/hadoop-azure-datalake/pom.xml b/hadoop-tools/hadoop-azure-datalake/pom.xml
index e32f9fcb3cb..660bfb9e97e 100644
--- a/hadoop-tools/hadoop-azure-datalake/pom.xml
+++ b/hadoop-tools/hadoop-azure-datalake/pom.xml
@@ -29,7 +29,7 @@
   </description>
   <packaging>jar</packaging>
   <properties>
-    <okHttpVersion>2.4.0</okHttpVersion>
+    <okHttpVersion>${okhttp.version}</okHttpVersion>
     <minimalJsonVersion>0.9.1</minimalJsonVersion>
     <file.encoding>UTF-8</file.encoding>
     <downloadSources>true</downloadSources>
@@ -120,7 +120,8 @@
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
       <artifactId>okhttp</artifactId>
-      <version>2.4.0</version>
+      <version>${okhttp.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -142,7 +143,7 @@
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>2.4.0</version>
+      <version>${okhttp.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>