This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new 74678b600bf [fix][sec] Exclude avro from hadoop-client (#21719)
74678b600bf is described below
commit 74678b600bf340d33be4a3fce71dec2ac5314172
Author: Xiangying Meng <[email protected]>
AuthorDate: Wed Dec 13 20:46:11 2023 +0800
[fix][sec] Exclude avro from hadoop-client (#21719)
(cherry picked from commit 95b9072261ab8481c724325d9b0a6f836524b7b3)
---
pulsar-io/hdfs2/pom.xml | 20 ++++++++++++--------
pulsar-io/hdfs3/pom.xml | 6 +++++-
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/pulsar-io/hdfs2/pom.xml b/pulsar-io/hdfs2/pom.xml
index 2efca6d299e..fdde7ff2b47 100644
--- a/pulsar-io/hdfs2/pom.xml
+++ b/pulsar-io/hdfs2/pom.xml
@@ -60,14 +60,18 @@
<artifactId>hadoop-client</artifactId>
<version>3.2.3</version>
<exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/pulsar-io/hdfs3/pom.xml b/pulsar-io/hdfs3/pom.xml
index 2c206a62e01..d3ff6a57aee 100644
--- a/pulsar-io/hdfs3/pom.xml
+++ b/pulsar-io/hdfs3/pom.xml
@@ -57,7 +57,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
@@ -79,6 +79,10 @@
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
</exclusions>
</dependency>