[fix][misc] Unable to connect an etcd metastore with recent releases …

…due to jetc-core sharding problem (apache#23604) Co-authored-by: Lari Hotari <[email protected]> (cherry picked from commit 89ccb73) (cherry picked from commit 23f1ef0)
datastax · Nov 21, 2024 · 969b274 · 969b274
1 parent 5cdb297
commit 969b274
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 52 deletions.
diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
@@ -56,7 +56,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
@@ -74,6 +74,7 @@
     </dependency>
   </dependencies>
   <build>
+    <finalName>${project.artifactId}-${project.version}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -141,54 +142,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
@@ -1082,7 +1082,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
@@ -457,7 +457,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
@@ -110,7 +110,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>jetcd-core-shaded</artifactId>
       <version>${project.version}</version>
-      <classifier>shaded</classifier>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>