HCFS: 1.2.3

shade org.apache.http in https://github.com/chrislusf/seaweedfs/issues/1080
5 years ago · e9dd5a602a
5 changed files with 21 additions and 5 deletions
--- 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.2.2</version>
+    <version>1.2.3</version>

    <parent>
        <groupId>org.sonatype.oss</groupId>
--- a/other/java/hdfs2/dependency-reduced-pom.xml
+++ b/other/java/hdfs2/dependency-reduced-pom.xml
@ -61,6 +61,10 @@
                    <exclude>org.apache.log4j</exclude>
                  </excludes>
                </relocation>
+                <relocation>
+                  <pattern>org.apache.http</pattern>
+                  <shadedPattern>shaded.org.apache.http</shadedPattern>
+                </relocation>
              </relocations>
            </configuration>
          </execution>
@ -123,7 +127,7 @@
    </snapshotRepository>
  </distributionManagement>
  <properties>
-    <seaweedfs.client.version>1.2.2</seaweedfs.client.version>
+    <seaweedfs.client.version>1.2.3</seaweedfs.client.version>
    <hadoop.version>2.9.2</hadoop.version>
  </properties>
 </project>
--- 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.2.2</seaweedfs.client.version>
+        <seaweedfs.client.version>1.2.3</seaweedfs.client.version>
        <hadoop.version>2.9.2</hadoop.version>
    </properties>

@ -79,6 +79,10 @@
                                        <exclude>org.apache.log4j</exclude>
                                    </excludes>
                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.http</pattern>
+                                    <shadedPattern>shaded.org.apache.http</shadedPattern>
+                                </relocation>
                            </relocations>
                        </configuration>
                    </execution>
--- a/other/java/hdfs3/dependency-reduced-pom.xml
+++ b/other/java/hdfs3/dependency-reduced-pom.xml
@ -61,6 +61,10 @@
                    <exclude>org.apache.log4j</exclude>
                  </excludes>
                </relocation>
+                <relocation>
+                  <pattern>org.apache.http</pattern>
+                  <shadedPattern>shaded.org.apache.http</shadedPattern>
+                </relocation>
              </relocations>
            </configuration>
          </execution>
@ -123,7 +127,7 @@
    </snapshotRepository>
  </distributionManagement>
  <properties>
-    <seaweedfs.client.version>1.2.2</seaweedfs.client.version>
+    <seaweedfs.client.version>1.2.3</seaweedfs.client.version>
    <hadoop.version>3.1.1</hadoop.version>
  </properties>
 </project>
--- 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.2.2</seaweedfs.client.version>
+        <seaweedfs.client.version>1.2.3</seaweedfs.client.version>
        <hadoop.version>3.1.1</hadoop.version>
    </properties>

@ -79,6 +79,10 @@
                                        <exclude>org.apache.log4j</exclude>
                                    </excludes>
                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.http</pattern>
+                                    <shadedPattern>shaded.org.apache.http</shadedPattern>
+                                </relocation>
                            </relocations>
                        </configuration>
                    </execution>