Quellcode durchsuchen

HADOOP-14651. Update okhttp version to 2.7.5.
Contributed by Ray Chiang and John Zhuge.

(cherry picked from commit e5351608ca040f0a081394bc821f8f4fda7d0c8d)

Steve Loughran vor 7 Jahren
Ursprung
Commit
0e170c7952
2 geänderte Dateien mit 6 neuen und 4 gelöschten Zeilen
  1. 2 1
      hadoop-project/pom.xml
  2. 4 3
      hadoop-tools/hadoop-azure-datalake/pom.xml

+ 2 - 1
hadoop-project/pom.xml

@@ -97,6 +97,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.7</javac.version>
@@ -143,7 +144,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>

+ 4 - 3
hadoop-tools/hadoop-azure-datalake/pom.xml

@@ -30,7 +30,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>
@@ -131,7 +131,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>
@@ -153,7 +154,7 @@
     <dependency>
       <groupId>com.squareup.okhttp</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>2.4.0</version>
+      <version>${okhttp.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>