This is an automated email from the ASF dual-hosted git repository.
jark pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 68d8174c996 [FLINK-35877][protobuf] Shade protobuf in
flink-sql-protobuf flink-sql-orc and flink-python
68d8174c996 is described below
commit 68d8174c996f05b2fbf9c50d0220a72f29e3a56b
Author: zhuanshenbsj1 <[email protected]>
AuthorDate: Wed Aug 7 10:03:10 2024 +0800
[FLINK-35877][protobuf] Shade protobuf in flink-sql-protobuf flink-sql-orc
and flink-python
This closes #25112
---
flink-formats/flink-sql-orc/pom.xml | 6 ++++++
flink-formats/flink-sql-protobuf/pom.xml | 6 ++++++
flink-python/pom.xml | 4 ++++
3 files changed, 16 insertions(+)
diff --git a/flink-formats/flink-sql-orc/pom.xml
b/flink-formats/flink-sql-orc/pom.xml
index 0d151e6e80b..fdefb95dd89 100644
--- a/flink-formats/flink-sql-orc/pom.xml
+++ b/flink-formats/flink-sql-orc/pom.xml
@@ -70,6 +70,12 @@ under the License.
<include>com.google.protobuf:protobuf-java</include>
</includes>
</artifactSet>
+ <relocations>
+ <relocation>
+
<pattern>com.google.protobuf</pattern>
+
<shadedPattern>org.apache.flink.orc.shaded.com.google.protobuf</shadedPattern>
+ </relocation>
+ </relocations>
</configuration>
</execution>
</executions>
diff --git a/flink-formats/flink-sql-protobuf/pom.xml
b/flink-formats/flink-sql-protobuf/pom.xml
index 24ccc79d2ac..80714676885 100644
--- a/flink-formats/flink-sql-protobuf/pom.xml
+++ b/flink-formats/flink-sql-protobuf/pom.xml
@@ -65,6 +65,12 @@ under the License.
<include>com.google.protobuf:protobuf-java</include>
</includes>
</artifactSet>
+ <relocations>
+ <relocation>
+
<pattern>com.google.protobuf</pattern>
+
<shadedPattern>org.apache.flink.formats.protobuf.shaded.com.google.protobuf</shadedPattern>
+ </relocation>
+ </relocations>
</configuration>
</execution>
</executions>
diff --git a/flink-python/pom.xml b/flink-python/pom.xml
index f267ce66b84..7afc822145e 100644
--- a/flink-python/pom.xml
+++ b/flink-python/pom.xml
@@ -717,6 +717,10 @@ under the License.
<pattern>com.google.flatbuffers</pattern>
<shadedPattern>org.apache.flink.api.python.shaded.com.google.flatbuffers</shadedPattern>
</relocation>
+ <relocation>
+
<pattern>com.google.protobuf</pattern>
+
<shadedPattern>org.apache.flink.api.python.shaded.com.google.protobuf</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>
