From f9c3b40eb09a231e9f41ebae7aef37ef81a40c2c Mon Sep 17 00:00:00 2001
From: Yike Xiao <kmter@live.com>
Date: Tue, 12 Nov 2024 00:53:49 +0800
Subject: [PATCH 1/3] Fix jetcd-core-shaded issue

---
 distribution/server/pom.xml |  1 -
 jetcd-core-shaded/pom.xml   | 54 +++++--------------------------------
 pom.xml                     |  1 -
 pulsar-broker/pom.xml       |  1 -
 pulsar-metadata/pom.xml     |  1 -
 5 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
index 265d21a672cbe..c8815fdd8da8d 100644
--- a/distribution/server/pom.xml
+++ b/distribution/server/pom.xml
@@ -49,7 +49,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>jetcd-core-shaded</artifactId>
       <version>${project.version}</version>
-      <classifier>shaded</classifier>
     </dependency>
 
     <dependency>
diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml
index 4cafcc1a44b77..ea01850cc2679 100644
--- a/jetcd-core-shaded/pom.xml
+++ b/jetcd-core-shaded/pom.xml
@@ -72,6 +72,12 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-util</artifactId>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.apache.maven.plugins</groupId>-->
+<!--      <artifactId>maven-shade-plugin</artifactId>-->
+<!--      <version>3.6.0</version>-->
+<!--      <scope>provided</scope>-->
+<!--    </dependency>-->
   </dependencies>
   <build>
     <plugins>
@@ -141,54 +147,6 @@
                   <file>${project.basedir}/dependency-reduced-pom.xml</file>
                 </transformer>
               </transformers>
-              <!-- required for IntelliJ support -->
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>shaded</shadedClassifierName>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- required for IntelliJ support, for some reason shadedArtifactAttached isn't sufficient alone -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-shaded-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</file>
-                  <type>jar</type>
-                  <classifier>shaded</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- required for running tests in subproject -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>${maven-antrun-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>unpack-shaded-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <unzip src="${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar"
-                       dest="${project.build.outputDirectory}"
-                       overwrite="true" />
-              </target>
             </configuration>
           </execution>
         </executions>
diff --git a/pom.xml b/pom.xml
index bf47646e16c71..0fd4545e34367 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1108,7 +1108,6 @@ flexible messaging model and an intuitive client API.</description>
         <groupId>${project.groupId}</groupId>
         <artifactId>jetcd-core-shaded</artifactId>
         <version>${project.version}</version>
-        <classifier>shaded</classifier>
         <exclusions>
           <exclusion>
             <groupId>io.etcd</groupId>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index dab39c0609da5..97ede1f76e969 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -487,7 +487,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>jetcd-core-shaded</artifactId>
       <version>${project.version}</version>
-      <classifier>shaded</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pulsar-metadata/pom.xml b/pulsar-metadata/pom.xml
index e32473cd434c3..229dd5ba610a9 100644
--- a/pulsar-metadata/pom.xml
+++ b/pulsar-metadata/pom.xml
@@ -125,7 +125,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>jetcd-core-shaded</artifactId>
       <version>${project.version}</version>
-      <classifier>shaded</classifier>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>

From b433b87e7afcc41cbbe3473dc8ad537db94246dc Mon Sep 17 00:00:00 2001
From: Yike Xiao <kmter@live.com>
Date: Fri, 15 Nov 2024 11:07:55 +0800
Subject: [PATCH 2/3] Change jetcd-core-shaded build finalName

---
 jetcd-core-shaded/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml
index ea01850cc2679..c169930e2596c 100644
--- a/jetcd-core-shaded/pom.xml
+++ b/jetcd-core-shaded/pom.xml
@@ -80,6 +80,7 @@
 <!--    </dependency>-->
   </dependencies>
   <build>
+    <finalName>${project.artifactId}-${project.version}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

From 8cb145adb545cdcc17121347724221b76e0afcbd Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@users.noreply.github.com>
Date: Fri, 15 Nov 2024 08:12:09 -0800
Subject: [PATCH 3/3] Remove unnecessary commented out dependency

---
 jetcd-core-shaded/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml
index c169930e2596c..b0e6e99052599 100644
--- a/jetcd-core-shaded/pom.xml
+++ b/jetcd-core-shaded/pom.xml
@@ -72,12 +72,6 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-util</artifactId>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>org.apache.maven.plugins</groupId>-->
-<!--      <artifactId>maven-shade-plugin</artifactId>-->
-<!--      <version>3.6.0</version>-->
-<!--      <scope>provided</scope>-->
-<!--    </dependency>-->
   </dependencies>
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>