This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a commit to branch release-1.17 in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.17 by this push:
new 52a2b98bb5a [FLINK-31612][Filesystems] Remove no longer necessary
Hadoop relocation rules for Azure/GS/OSS filesystems
52a2b98bb5a is described below
commit 52a2b98bb5af842633df0c051b5da95d437a6b2f
Author: Martijn Visser <mvis...@confluent.io>
AuthorDate: Mon Mar 27 10:55:16 2023 +0200
[FLINK-31612][Filesystems] Remove no longer necessary Hadoop relocation
rules for Azure/GS/OSS filesystems
(cherry picked from commit 3924ba85e62f04a0a181007d573cb84e3c09a636)
---
flink-filesystems/flink-azure-fs-hadoop/pom.xml | 48 ++-----------------------
flink-filesystems/flink-gs-fs-hadoop/pom.xml | 19 ++--------
flink-filesystems/flink-oss-fs-hadoop/pom.xml | 13 -------
3 files changed, 4 insertions(+), 76 deletions(-)
diff --git a/flink-filesystems/flink-azure-fs-hadoop/pom.xml
b/flink-filesystems/flink-azure-fs-hadoop/pom.xml
index b88fa3a55ed..c63e7c22ff0 100644
--- a/flink-filesystems/flink-azure-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-azure-fs-hadoop/pom.xml
@@ -129,56 +129,12 @@ under the License.
</includes>
</artifactSet>
<relocations>
- <!-- relocate
the references to Hadoop to match the shaded Hadoop config -->
- <relocation>
-
<pattern>org.apache.hadoop</pattern>
-
<shadedPattern>org.apache.flink.fs.shaded.hadoop3.org.apache.hadoop</shadedPattern>
- </relocation>
-
- <!-- shade
dependencies internally used by Hadoop and never exposed downstream -->
- <relocation>
-
<pattern>org.apache.commons</pattern>
-
<shadedPattern>org.apache.flink.fs.shaded.hadoop3.org.apache.commons</shadedPattern>
- </relocation>
-
- <!-- relocate
the Azure dependencies -->
- <relocation>
-
<pattern>com.microsoft.azure</pattern>
-
<shadedPattern>org.apache.flink.fs.azure.shaded.com.microsoft.azure</shadedPattern>
- </relocation>
-
- <!-- shade
dependencies internally used by Azure and never exposed downstream -->
- <relocation>
-
<pattern>org.apache.http</pattern>
-
<shadedPattern>org.apache.flink.fs.azure.shaded.org.apache.http</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>commons-logging</pattern>
-
<shadedPattern>org.apache.flink.fs.azure.shaded.commons-logging</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>commons-codec</pattern>
-
<shadedPattern>org.apache.flink.fs.azure.shaded.commons-codec</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml</pattern>
-
<shadedPattern>org.apache.flink.fs.azure.shaded.com.fasterxml</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.google</pattern>
-
<shadedPattern>org.apache.flink.fs.azure.shaded.com.google</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>org.eclipse</pattern>
-
<shadedPattern>org.apache.flink.fs.azure.shaded.org.eclipse</shadedPattern>
- </relocation>
-
- <!-- shade
Flink's Hadoop FS adapter classes -->
+ <!-- shade
Flink's Hadoop FS adapter classes, forces plugin classloader for them -->
<relocation>
<pattern>org.apache.flink.runtime.fs.hdfs</pattern>
<shadedPattern>org.apache.flink.fs.azure.common.hadoop</shadedPattern>
</relocation>
- <!-- shade
Flink's Hadoop FS utility classes -->
+ <!-- shade
Flink's Hadoop FS utility classes, forces plugin classloader for them -->
<relocation>
<pattern>org.apache.flink.runtime.util</pattern>
<shadedPattern>org.apache.flink.fs.azure.common</shadedPattern>
diff --git a/flink-filesystems/flink-gs-fs-hadoop/pom.xml
b/flink-filesystems/flink-gs-fs-hadoop/pom.xml
index 668b153c555..3e4329a2af0 100644
--- a/flink-filesystems/flink-gs-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-gs-fs-hadoop/pom.xml
@@ -188,31 +188,16 @@ under the License.
</includes>
</artifactSet>
<relocations>
-
- <!-- relocate
the references to Hadoop to match the shaded Hadoop config -->
- <relocation>
-
<pattern>org.apache.hadoop</pattern>
-
<shadedPattern>org.apache.flink.fs.shaded.hadoop3.org.apache.hadoop</shadedPattern>
- </relocation>
-
- <!-- shade
dependencies internally used by Hadoop and never exposed downstream -->
- <relocation>
-
<pattern>org.apache.commons</pattern>
-
<shadedPattern>org.apache.flink.fs.shaded.hadoop3.org.apache.commons</shadedPattern>
- </relocation>
-
- <!-- shade
Flink's Hadoop FS adapter classes -->
+ <!-- shade
Flink's Hadoop FS adapter classes, forces plugin classloader for them -->
<relocation>
<pattern>org.apache.flink.runtime.fs.hdfs</pattern>
<shadedPattern>org.apache.flink.fs.gs.org.apache.flink.runtime.fs.hdfs</shadedPattern>
</relocation>
-
- <!-- shade
Flink's Hadoop FS utility classes -->
+ <!-- shade
Flink's Hadoop FS utility classes, forces plugin classloader for them -->
<relocation>
<pattern>org.apache.flink.runtime.util</pattern>
<shadedPattern>org.apache.flink.fs.gs.org.apache.flink.runtime.util</shadedPattern>
</relocation>
-
</relocations>
<filters>
<filter>
diff --git a/flink-filesystems/flink-oss-fs-hadoop/pom.xml
b/flink-filesystems/flink-oss-fs-hadoop/pom.xml
index a0ce2e8c2ee..3f17187bf3d 100644
--- a/flink-filesystems/flink-oss-fs-hadoop/pom.xml
+++ b/flink-filesystems/flink-oss-fs-hadoop/pom.xml
@@ -145,19 +145,6 @@ under the License.
</includes>
</artifactSet>
<relocations>
- <relocation>
-
<pattern>org.apache.hadoop</pattern>
-
<shadedPattern>org.apache.flink.fs.shaded.hadoop3.org.apache.hadoop</shadedPattern>
- </relocation>
- <!-- relocate
the OSS dependencies -->
- <relocation>
-
<pattern>com.aliyun</pattern>
-
<shadedPattern>org.apache.flink.fs.osshadoop.shaded.com.aliyun</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.aliyuncs</pattern>
-
<shadedPattern>org.apache.flink.fs.osshadoop.shaded.com.aliyuncs</shadedPattern>
- </relocation>
<!-- shade
Flink's Hadoop FS adapter classes, forces plugin classloader for them -->
<relocation>
<pattern>org.apache.flink.runtime.fs.hdfs</pattern>
