From 15f968b0546cdf9d5ee6215ff967de0b3ea4b552 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Wed, 9 Oct 2019 18:09:08 -0700
Subject: [PATCH] HCFS: avoid possible jar problem

---
 other/java/client/pom.xml                              |  2 +-
 .../src/main/java/seaweedfs/client/SeaweedRead.java    | 10 +++-------
 other/java/hdfs2/dependency-reduced-pom.xml            |  2 +-
 other/java/hdfs2/pom.xml                               |  2 +-
 other/java/hdfs3/dependency-reduced-pom.xml            |  2 +-
 other/java/hdfs3/pom.xml                               |  2 +-
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml
index be9470cb9..15921c4dd 100644
--- a/other/java/client/pom.xml
+++ b/other/java/client/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.github.chrislusf</groupId>
     <artifactId>seaweedfs-client</artifactId>
-    <version>1.1.8</version>
+    <version>1.1.9</version>
 
     <parent>
         <groupId>org.sonatype.oss</groupId>
diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
index a307983bb..de8da28d7 100644
--- a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
+++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java
@@ -5,16 +5,12 @@ import org.apache.http.HttpHeaders;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.DefaultHttpClient;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class SeaweedRead {
 
@@ -59,7 +55,7 @@ public class SeaweedRead {
     }
 
     private static int readChunkView(long position, byte[] buffer, int startOffset, ChunkView chunkView, FilerProto.Locations locations) {
-        HttpClient client = HttpClientBuilder.create().build();
+        HttpClient client = new DefaultHttpClient();
         HttpGet request = new HttpGet(
             String.format("http://%s/%s", locations.getLocations(0).getUrl(), chunkView.fileId));
 
diff --git a/other/java/hdfs2/dependency-reduced-pom.xml b/other/java/hdfs2/dependency-reduced-pom.xml
index 513275814..6763ca1cd 100644
--- a/other/java/hdfs2/dependency-reduced-pom.xml
+++ b/other/java/hdfs2/dependency-reduced-pom.xml
@@ -123,7 +123,7 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <seaweedfs.client.version>1.1.8</seaweedfs.client.version>
+    <seaweedfs.client.version>1.1.9</seaweedfs.client.version>
     <hadoop.version>2.9.2</hadoop.version>
   </properties>
 </project>
diff --git a/other/java/hdfs2/pom.xml b/other/java/hdfs2/pom.xml
index a21b56085..bb1df42a7 100644
--- a/other/java/hdfs2/pom.xml
+++ b/other/java/hdfs2/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <seaweedfs.client.version>1.1.8</seaweedfs.client.version>
+        <seaweedfs.client.version>1.1.9</seaweedfs.client.version>
         <hadoop.version>2.9.2</hadoop.version>
     </properties>
 
diff --git a/other/java/hdfs3/dependency-reduced-pom.xml b/other/java/hdfs3/dependency-reduced-pom.xml
index 8852f8016..0968611c8 100644
--- a/other/java/hdfs3/dependency-reduced-pom.xml
+++ b/other/java/hdfs3/dependency-reduced-pom.xml
@@ -123,7 +123,7 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <seaweedfs.client.version>1.1.8</seaweedfs.client.version>
+    <seaweedfs.client.version>1.1.9</seaweedfs.client.version>
     <hadoop.version>3.1.1</hadoop.version>
   </properties>
 </project>
diff --git a/other/java/hdfs3/pom.xml b/other/java/hdfs3/pom.xml
index 8f35caef2..a30705562 100644
--- a/other/java/hdfs3/pom.xml
+++ b/other/java/hdfs3/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <seaweedfs.client.version>1.1.8</seaweedfs.client.version>
+        <seaweedfs.client.version>1.1.9</seaweedfs.client.version>
         <hadoop.version>3.1.1</hadoop.version>
     </properties>