This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 8171257a62 [INLONG-10332][Sort] Relocate the google.protobuf in
Iceberg Connector (#10334)
8171257a62 is described below
commit 8171257a6290a796f2b8d10f03aa2686a1c8470c
Author: XiaoYou201 <[email protected]>
AuthorDate: Mon Jun 3 16:04:28 2024 +0800
[INLONG-10332][Sort] Relocate the google.protobuf in Iceberg Connector
(#10334)
Co-authored-by: vinnerzhang <[email protected]>
---
.../sort-flink/sort-flink-v1.15/sort-connectors/iceberg/pom.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/iceberg/pom.xml
b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/iceberg/pom.xml
index fa5426f5d5..ab7a6176d5 100644
--- a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/iceberg/pom.xml
+++ b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/iceberg/pom.xml
@@ -124,7 +124,7 @@
<artifactSet>
<includes>
<include>org.apache.inlong:*</include>
-
<include>com.google.protobuf:protobuf-java</include>
+ <include>com.google.protobuf:*</include>
<include>org.apache.kafka:*</include>
<include>com.fasterxml.*:*</include>
<include>org.apache.iceberg:*</include>
@@ -159,6 +159,10 @@
<pattern>org.apache.inlong.sort.base</pattern>
<shadedPattern>org.apache.inlong.sort.iceberg.shaded.org.apache.inlong.sort.base</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>com.google.protobuf</pattern>
+
<shadedPattern>org.apache.inlong.sort.iceberg.shaded.com.google.protobuf</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>
