diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-10-11 23:56:04 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-10-11 23:56:04 -0700 |
| commit | e9dd5a602a4acf9da21b56e57a510d1f9a24875c (patch) | |
| tree | dcb177085e6ad304dc6e259f425fddfc9485dff4 | |
| parent | 7057e7a076b109e5d3e9140b27fa4e8beabcbc71 (diff) | |
| download | seaweedfs-e9dd5a602a4acf9da21b56e57a510d1f9a24875c.tar.xz seaweedfs-e9dd5a602a4acf9da21b56e57a510d1f9a24875c.zip | |
HCFS: 1.2.3
shade org.apache.http in https://github.com/chrislusf/seaweedfs/issues/1080
| -rw-r--r-- | other/java/client/pom.xml | 2 | ||||
| -rw-r--r-- | other/java/hdfs2/dependency-reduced-pom.xml | 6 | ||||
| -rw-r--r-- | other/java/hdfs2/pom.xml | 6 | ||||
| -rw-r--r-- | other/java/hdfs3/dependency-reduced-pom.xml | 6 | ||||
| -rw-r--r-- | 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 @@ <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> 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 @@ <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>
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 @@ <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> 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 @@ <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>
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 @@ <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> |