From e9dd5a602a4acf9da21b56e57a510d1f9a24875c Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Fri, 11 Oct 2019 23:56:04 -0700 Subject: [PATCH] HCFS: 1.2.3 shade org.apache.http in https://github.com/chrislusf/seaweedfs/issues/1080 --- other/java/client/pom.xml | 2 +- other/java/hdfs2/dependency-reduced-pom.xml | 6 +++++- other/java/hdfs2/pom.xml | 6 +++++- other/java/hdfs3/dependency-reduced-pom.xml | 6 +++++- other/java/hdfs3/pom.xml | 6 +++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index 413897238..47742ab8d 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -4,7 +4,7 @@ com.github.chrislusf seaweedfs-client - 1.2.2 + 1.2.3 org.sonatype.oss diff --git a/other/java/hdfs2/dependency-reduced-pom.xml b/other/java/hdfs2/dependency-reduced-pom.xml index bdc8c0b12..3b964951e 100644 --- a/other/java/hdfs2/dependency-reduced-pom.xml +++ b/other/java/hdfs2/dependency-reduced-pom.xml @@ -61,6 +61,10 @@ org.apache.log4j + + org.apache.http + shaded.org.apache.http + @@ -123,7 +127,7 @@ - 1.2.2 + 1.2.3 2.9.2 diff --git a/other/java/hdfs2/pom.xml b/other/java/hdfs2/pom.xml index ce5798da3..7782ccbe2 100644 --- a/other/java/hdfs2/pom.xml +++ b/other/java/hdfs2/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - 1.2.2 + 1.2.3 2.9.2 @@ -79,6 +79,10 @@ org.apache.log4j + + org.apache.http + shaded.org.apache.http + diff --git a/other/java/hdfs3/dependency-reduced-pom.xml b/other/java/hdfs3/dependency-reduced-pom.xml index b5224b725..6a12b1617 100644 --- a/other/java/hdfs3/dependency-reduced-pom.xml +++ b/other/java/hdfs3/dependency-reduced-pom.xml @@ -61,6 +61,10 @@ org.apache.log4j + + org.apache.http + shaded.org.apache.http + @@ -123,7 +127,7 @@ - 1.2.2 + 1.2.3 3.1.1 diff --git a/other/java/hdfs3/pom.xml b/other/java/hdfs3/pom.xml index f676970ba..2af787767 100644 --- a/other/java/hdfs3/pom.xml +++ b/other/java/hdfs3/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - 1.2.2 + 1.2.3 3.1.1 @@ -79,6 +79,10 @@ org.apache.log4j + + org.apache.http + shaded.org.apache.http +