This is an automated email from the ASF dual-hosted git repository.
yunqing 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 a8a65810e [INLONG-7377][Sort] Fix sort-dist protobuf conflicts with
protobuf in sort-connectors (#7378)
a8a65810e is described below
commit a8a65810e7639292e021b0a039a7b95b7629a4d1
Author: Schnapps <zpen...@connect.ust.hk>
AuthorDate: Thu Feb 16 15:27:48 2023 +0800
[INLONG-7377][Sort] Fix sort-dist protobuf conflicts with protobuf in
sort-connectors (#7378)
---
inlong-sort/sort-connectors/filesystem/pom.xml | 1 +
inlong-sort/sort-connectors/hbase/pom.xml | 1 +
inlong-sort/sort-connectors/hudi/pom.xml | 1 +
inlong-sort/sort-connectors/iceberg/pom.xml | 1 +
inlong-sort/sort-connectors/kafka/pom.xml | 1 +
inlong-sort/sort-connectors/mongodb-cdc/pom.xml | 1 +
inlong-sort/sort-connectors/mysql-cdc/pom.xml | 1 +
inlong-sort/sort-connectors/oracle-cdc/pom.xml | 1 +
inlong-sort/sort-connectors/postgres-cdc/pom.xml | 1 +
inlong-sort/sort-connectors/pulsar/pom.xml | 1 +
inlong-sort/sort-connectors/sqlserver-cdc/pom.xml | 1 +
inlong-sort/sort-dist/pom.xml | 4 ++--
12 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/inlong-sort/sort-connectors/filesystem/pom.xml
b/inlong-sort/sort-connectors/filesystem/pom.xml
index 54545dab1..57735743a 100644
--- a/inlong-sort/sort-connectors/filesystem/pom.xml
+++ b/inlong-sort/sort-connectors/filesystem/pom.xml
@@ -53,6 +53,7 @@
<artifactSet>
<includes>
<include>org.apache.inlong:*</include>
+ <include>com.google.protobuf:*</include>
</includes>
</artifactSet>
<filters>
diff --git a/inlong-sort/sort-connectors/hbase/pom.xml
b/inlong-sort/sort-connectors/hbase/pom.xml
index 019ae7819..823992ac0 100644
--- a/inlong-sort/sort-connectors/hbase/pom.xml
+++ b/inlong-sort/sort-connectors/hbase/pom.xml
@@ -108,6 +108,7 @@
<include>org.apache.commons:commons-crypto</include>
<include>org.apache.commons:commons-lang3</include>
<include>io.netty:netty-all</include>
+ <include>com.google.protobuf:*</include>
<include>io.dropwizard.metrics:metrics-core</include>
</includes>
<excludes>
diff --git a/inlong-sort/sort-connectors/hudi/pom.xml
b/inlong-sort/sort-connectors/hudi/pom.xml
index 660e17113..e62f42f8d 100644
--- a/inlong-sort/sort-connectors/hudi/pom.xml
+++ b/inlong-sort/sort-connectors/hudi/pom.xml
@@ -111,6 +111,7 @@
<include>com.fasterxml.woodstox:*</include>
<include>org.codehaus.woodstox:*</include>
<include>com.google.guava:*</include>
+ <include>com.google.protobuf:*</include>
</includes>
</artifactSet>
<filters>
diff --git a/inlong-sort/sort-connectors/iceberg/pom.xml
b/inlong-sort/sort-connectors/iceberg/pom.xml
index c3cb35176..7d33b4a6e 100644
--- a/inlong-sort/sort-connectors/iceberg/pom.xml
+++ b/inlong-sort/sort-connectors/iceberg/pom.xml
@@ -87,6 +87,7 @@
<include>org.apache.iceberg:*</include>
<include>org.apache.hive:hive-exec</include>
<include>org.apache.thrift:libfb303</include>
+ <include>com.google.protobuf:*</include>
</includes>
</artifactSet>
<filters>
diff --git a/inlong-sort/sort-connectors/kafka/pom.xml
b/inlong-sort/sort-connectors/kafka/pom.xml
index 1f645cf91..cb77f730e 100644
--- a/inlong-sort/sort-connectors/kafka/pom.xml
+++ b/inlong-sort/sort-connectors/kafka/pom.xml
@@ -65,6 +65,7 @@
<includes>
<include>org.apache.inlong:*</include>
<include>org.apache.kafka:*</include>
+ <include>com.google.protobuf:*</include>
<include>org.apache.flink:flink-connector-kafka_${scala.binary.version}</include>
</includes>
</artifactSet>
diff --git a/inlong-sort/sort-connectors/mongodb-cdc/pom.xml
b/inlong-sort/sort-connectors/mongodb-cdc/pom.xml
index c3019e20c..38bb08f93 100644
--- a/inlong-sort/sort-connectors/mongodb-cdc/pom.xml
+++ b/inlong-sort/sort-connectors/mongodb-cdc/pom.xml
@@ -99,6 +99,7 @@
<include>com.google.guava:*</include>
<!-- Include fixed version 18.0-13.0 of
flink shaded guava -->
<include>org.apache.flink:flink-shaded-guava</include>
+ <include>com.google.protobuf:*</include>
</includes>
</artifactSet>
<filters>
diff --git a/inlong-sort/sort-connectors/mysql-cdc/pom.xml
b/inlong-sort/sort-connectors/mysql-cdc/pom.xml
index 61a50198d..2f8405d90 100644
--- a/inlong-sort/sort-connectors/mysql-cdc/pom.xml
+++ b/inlong-sort/sort-connectors/mysql-cdc/pom.xml
@@ -96,6 +96,7 @@
<include>com.zaxxer:HikariCP</include>
<!-- Include fixed version 18.0-13.0 of
flink shaded guava -->
<include>org.apache.flink:flink-shaded-guava</include>
+ <include>com.google.protobuf:*</include>
</includes>
</artifactSet>
<filters>
diff --git a/inlong-sort/sort-connectors/oracle-cdc/pom.xml
b/inlong-sort/sort-connectors/oracle-cdc/pom.xml
index 18908c647..836ae3d82 100644
--- a/inlong-sort/sort-connectors/oracle-cdc/pom.xml
+++ b/inlong-sort/sort-connectors/oracle-cdc/pom.xml
@@ -116,6 +116,7 @@
<include>com.google.guava:*</include>
<!-- Include fixed version 18.0-13.0 of
flink shaded guava -->
<include>org.apache.flink:flink-shaded-guava</include>
+ <include>com.google.protobuf:*</include>
</includes>
</artifactSet>
<filters>
diff --git a/inlong-sort/sort-connectors/postgres-cdc/pom.xml
b/inlong-sort/sort-connectors/postgres-cdc/pom.xml
index cc2c242f8..a1d16ef8e 100644
--- a/inlong-sort/sort-connectors/postgres-cdc/pom.xml
+++ b/inlong-sort/sort-connectors/postgres-cdc/pom.xml
@@ -110,6 +110,7 @@
<include>com.fasterxml.*:*</include>
<!-- Include fixed version 18.0-13.0 of
flink shaded guava -->
<include>org.apache.flink:flink-shaded-guava</include>
+ <include>com.google.protobuf:*</include>
</includes>
</artifactSet>
<filters>
diff --git a/inlong-sort/sort-connectors/pulsar/pom.xml
b/inlong-sort/sort-connectors/pulsar/pom.xml
index 72fa76824..c7b493def 100644
--- a/inlong-sort/sort-connectors/pulsar/pom.xml
+++ b/inlong-sort/sort-connectors/pulsar/pom.xml
@@ -85,6 +85,7 @@
<include>io.streamnative.connectors:pulsar-flink-connector-origin*</include>
<include>io.streamnative.connectors:flink-protobuf</include>
<include>org.apache.pulsar:*</include>
+ <include>com.google.protobuf:*</include>
<include>org.bouncycastle*:*</include>
<include>org.bouncycastle*:*</include>
<include>javax.*:*</include>
diff --git a/inlong-sort/sort-connectors/sqlserver-cdc/pom.xml
b/inlong-sort/sort-connectors/sqlserver-cdc/pom.xml
index 86b16f94b..9835f7f94 100644
--- a/inlong-sort/sort-connectors/sqlserver-cdc/pom.xml
+++ b/inlong-sort/sort-connectors/sqlserver-cdc/pom.xml
@@ -69,6 +69,7 @@
<include>com.google.guava:*</include>
<!-- Include fixed version 18.0-13.0 of
flink shaded guava -->
<include>org.apache.flink:flink-shaded-guava</include>
+ <include>com.google.protobuf:*</include>
</includes>
</artifactSet>
<filters>
diff --git a/inlong-sort/sort-dist/pom.xml b/inlong-sort/sort-dist/pom.xml
index b346f962b..9a6712473 100644
--- a/inlong-sort/sort-dist/pom.xml
+++ b/inlong-sort/sort-dist/pom.xml
@@ -116,19 +116,19 @@
</goals>
<phase>package</phase>
<configuration>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached>
<finalName>${project.artifactId}-${project.version}</finalName>
<filters>
<!-- Globally exclude log4j.properties from
our JAR files. -->
<filter>
- <artifact>*</artifact>
+ <artifact>*:*</artifact>
<excludes>
<exclude>log4j.properties</exclude>
<exclude>log4j-test.properties</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
+
<exclude>com/google/protobuf/**</exclude>
</excludes>
</filter>
</filters>
