This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-3.3 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 73e06ff1393660066233513c31e47bb2388c7987 Author: 萧易客 <[email protected]> AuthorDate: Sun Nov 17 02:45:12 2024 +0800 [fix][misc] Unable to connect an etcd metastore with recent releases due to jetc-core sharding problem (#23604) Co-authored-by: Lari Hotari <[email protected]> (cherry picked from commit 89ccb7361b80dfb7897ea2555dfb6e884f62b916) --- distribution/server/pom.xml | 1 - jetcd-core-shaded/pom.xml | 49 +-------------------------------------------- pom.xml | 1 - pulsar-broker/pom.xml | 1 - pulsar-metadata/pom.xml | 1 - 5 files changed, 1 insertion(+), 52 deletions(-) diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml index 7f63f91d16f..2cc1d65504e 100644 --- a/distribution/server/pom.xml +++ b/distribution/server/pom.xml @@ -50,7 +50,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 cd410a1c6b1..0b22e0a31fe 100644 --- 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 index 4cf93d26d94..8c96b04b3cd 100644 --- a/pom.xml +++ b/pom.xml @@ -1091,7 +1091,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 918c25fd119..c2912f1bd3c 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -483,7 +483,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 ff6e7f93775..04489912f58 100644 --- a/pulsar-metadata/pom.xml +++ b/pulsar-metadata/pom.xml @@ -126,7 +126,6 @@ <groupId>${project.groupId}</groupId> <artifactId>jetcd-core-shaded</artifactId> <version>${project.version}</version> - <classifier>shaded</classifier> </dependency> <dependency> <groupId>io.grpc</groupId>
