From 444da414b5f6dcb1ec8d66bf5bbda86e65ce8da1 Mon Sep 17 00:00:00 2001
From: Yike Xiao <kmter@live.com>
Date: Sat, 23 Nov 2024 01:03:17 +0800
Subject: [PATCH] Make protobuf-java optional for pulsar client shaded
 libraries

---
 pulsar-client-admin-shaded/pom.xml | 5 +++++
 pulsar-client-all/pom.xml          | 5 +++++
 pulsar-client-shaded/pom.xml       | 5 +++++
 pulsar-client/pom.xml              | 2 +-
 pulsar-common/pom.xml              | 1 -
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
index ab42f0e2aef59..38809a61c6d6d 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -44,6 +44,11 @@
       <version>${project.parent.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
index e26f6eeac57bf..8b7e2e4faa1c2 100644
--- a/pulsar-client-all/pom.xml
+++ b/pulsar-client-all/pom.xml
@@ -53,6 +53,11 @@
       <version>${project.parent.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index cd87d901b21bb..43bcff71a0e7b 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -47,6 +47,11 @@
       <artifactId>pulsar-client-messagecrypto-bc</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml
index 49bb3c6490ae9..3e8b02b8bb69e 100644
--- a/pulsar-client/pom.xml
+++ b/pulsar-client/pom.xml
@@ -166,7 +166,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index c65c98ee91be0..be72ff3ed7c03 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -203,7 +203,6 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <optional>true</optional>
     </dependency>
 
     <dependency>