From d6683cab2bc866f54a8ab01c7cf2b0076c4b1f48 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Tue, 11 Jun 2024 20:10:30 +0300 Subject: [PATCH 01/11] [improve][misc] Upgrade to Netty 4.1.111.Final --- .../server/src/assemble/LICENSE.bin.txt | 42 +++++++++---------- .../shell/src/assemble/LICENSE.bin.txt | 40 +++++++++--------- pom.xml | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 6769df3903719..a36f1ab848a63 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -292,27 +292,27 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-lang3-3.11.jar - org.apache.commons-commons-text-1.10.0.jar * Netty - - io.netty-netty-buffer-4.1.108.Final.jar - - io.netty-netty-codec-4.1.108.Final.jar - - io.netty-netty-codec-dns-4.1.108.Final.jar - - io.netty-netty-codec-http-4.1.108.Final.jar - - io.netty-netty-codec-http2-4.1.108.Final.jar - - io.netty-netty-codec-socks-4.1.108.Final.jar - - io.netty-netty-codec-haproxy-4.1.108.Final.jar - - io.netty-netty-common-4.1.108.Final.jar - - io.netty-netty-handler-4.1.108.Final.jar - - io.netty-netty-handler-proxy-4.1.108.Final.jar - - io.netty-netty-resolver-4.1.108.Final.jar - - io.netty-netty-resolver-dns-4.1.108.Final.jar - - io.netty-netty-resolver-dns-classes-macos-4.1.108.Final.jar - - io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-aarch_64.jar - - io.netty-netty-resolver-dns-native-macos-4.1.108.Final-osx-x86_64.jar - - io.netty-netty-transport-4.1.108.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.108.Final.jar - - io.netty-netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar - - io.netty-netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar - - io.netty-netty-transport-native-unix-common-4.1.108.Final.jar - - io.netty-netty-transport-native-unix-common-4.1.108.Final-linux-x86_64.jar + - io.netty-netty-buffer-4.1.111.Final.jar + - io.netty-netty-codec-4.1.111.Final.jar + - io.netty-netty-codec-dns-4.1.111.Final.jar + - io.netty-netty-codec-http-4.1.111.Final.jar + - io.netty-netty-codec-http2-4.1.111.Final.jar + - io.netty-netty-codec-socks-4.1.111.Final.jar + - io.netty-netty-codec-haproxy-4.1.111.Final.jar + - io.netty-netty-common-4.1.111.Final.jar + - io.netty-netty-handler-4.1.111.Final.jar + - io.netty-netty-handler-proxy-4.1.111.Final.jar + - io.netty-netty-resolver-4.1.111.Final.jar + - io.netty-netty-resolver-dns-4.1.111.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.111.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.111.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.111.Final.jar + - io.netty-netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar + - io.netty-netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar + - io.netty-netty-transport-native-unix-common-4.1.111.Final.jar + - io.netty-netty-transport-native-unix-common-4.1.111.Final-linux-x86_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.65.Final.jar - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index 5c3b051cfdd70..ff590023ff3a5 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -347,23 +347,23 @@ The Apache Software License, Version 2.0 - commons-text-1.10.0.jar - commons-compress-1.26.0.jar * Netty - - netty-buffer-4.1.108.Final.jar - - netty-codec-4.1.108.Final.jar - - netty-codec-dns-4.1.108.Final.jar - - netty-codec-http-4.1.108.Final.jar - - netty-codec-socks-4.1.108.Final.jar - - netty-codec-haproxy-4.1.108.Final.jar - - netty-common-4.1.108.Final.jar - - netty-handler-4.1.108.Final.jar - - netty-handler-proxy-4.1.108.Final.jar - - netty-resolver-4.1.108.Final.jar - - netty-resolver-dns-4.1.108.Final.jar - - netty-transport-4.1.108.Final.jar - - netty-transport-classes-epoll-4.1.108.Final.jar - - netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar - - netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar - - netty-transport-native-unix-common-4.1.108.Final.jar - - netty-transport-native-unix-common-4.1.108.Final-linux-x86_64.jar + - netty-buffer-4.1.111.Final.jar + - netty-codec-4.1.111.Final.jar + - netty-codec-dns-4.1.111.Final.jar + - netty-codec-http-4.1.111.Final.jar + - netty-codec-socks-4.1.111.Final.jar + - netty-codec-haproxy-4.1.111.Final.jar + - netty-common-4.1.111.Final.jar + - netty-handler-4.1.111.Final.jar + - netty-handler-proxy-4.1.111.Final.jar + - netty-resolver-4.1.111.Final.jar + - netty-resolver-dns-4.1.111.Final.jar + - netty-transport-4.1.111.Final.jar + - netty-transport-classes-epoll-4.1.111.Final.jar + - netty-transport-native-epoll-4.1.111.Final-linux-aarch_64.jar + - netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar + - netty-transport-native-unix-common-4.1.111.Final.jar + - netty-transport-native-unix-common-4.1.111.Final-linux-x86_64.jar - netty-tcnative-boringssl-static-2.0.65.Final.jar - netty-tcnative-boringssl-static-2.0.65.Final-linux-aarch_64.jar - netty-tcnative-boringssl-static-2.0.65.Final-linux-x86_64.jar @@ -374,9 +374,9 @@ The Apache Software License, Version 2.0 - netty-incubator-transport-classes-io_uring-0.0.24.Final.jar - netty-incubator-transport-native-io_uring-0.0.24.Final-linux-aarch_64.jar - netty-incubator-transport-native-io_uring-0.0.24.Final-linux-x86_64.jar - - netty-resolver-dns-classes-macos-4.1.108.Final.jar - - netty-resolver-dns-native-macos-4.1.108.Final-osx-aarch_64.jar - - netty-resolver-dns-native-macos-4.1.108.Final-osx-x86_64.jar + - netty-resolver-dns-classes-macos-4.1.111.Final.jar + - netty-resolver-dns-native-macos-4.1.111.Final-osx-aarch_64.jar + - netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar * Prometheus client - simpleclient-0.16.0.jar - simpleclient_log4j2-0.16.0.jar diff --git a/pom.xml b/pom.xml index 1514b7da13a17..61f18aeb41b09 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ flexible messaging model and an intuitive client API. 1.1.10.5 4.1.12.1 5.1.0 - 4.1.108.Final + 4.1.111.Final 0.0.24.Final 9.4.54.v20240208 2.5.2 From b11f402384fa6fa8ba10ab87f30cc0584b1764a7 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 10:42:20 +0300 Subject: [PATCH 02/11] Add jetcd-core-shaded module which uses grpc-netty-shaded --- .../server/src/assemble/LICENSE.bin.txt | 2 - jetcd-core-shaded/pom.xml | 125 ++++++++++++++++++ pom.xml | 25 +++- pulsar-broker/pom.xml | 32 +++++ pulsar-metadata/pom.xml | 31 ++++- .../metadata/impl/EtcdMetadataStore.java | 6 +- 6 files changed, 212 insertions(+), 9 deletions(-) create mode 100644 jetcd-core-shaded/pom.xml diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index a36f1ab848a63..41e1ce82c3596 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -434,7 +434,6 @@ The Apache Software License, Version 2.0 - io.grpc-grpc-auth-1.56.0.jar - io.grpc-grpc-context-1.56.0.jar - io.grpc-grpc-core-1.56.0.jar - - io.grpc-grpc-netty-1.56.0.jar - io.grpc-grpc-protobuf-1.56.0.jar - io.grpc-grpc-protobuf-lite-1.56.0.jar - io.grpc-grpc-stub-1.56.0.jar @@ -498,7 +497,6 @@ The Apache Software License, Version 2.0 - io.vertx-vertx-core-4.5.8.jar - io.vertx-vertx-web-4.5.8.jar - io.vertx-vertx-web-common-4.5.8.jar - - io.vertx-vertx-grpc-4.5.8.jar * Apache ZooKeeper - org.apache.zookeeper-zookeeper-3.9.2.jar - org.apache.zookeeper-zookeeper-jute-3.9.2.jar diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml new file mode 100644 index 0000000000000..207fde7a70c4d --- /dev/null +++ b/jetcd-core-shaded/pom.xml @@ -0,0 +1,125 @@ + + + + 4.0.0 + + org.apache.pulsar + pulsar + 3.4.0-SNAPSHOT + + + jetcd-core-shaded + Apache Pulsar :: jetcd-core shaded + + + + io.etcd + jetcd-core + + + io.grpc + grpc-netty + + + + + io.grpc + grpc-netty-shaded + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + true + true + false + + + io.etcd:* + io.vertx:* + + + + + + io.vertx + org.apache.pulsar.jetcd.shaded.io.vertx + + + + io.grpc.netty + io.grpc.netty.shaded.io.grpc.netty + + + + io.netty + io.grpc.netty.shaded.io.netty + + + + + + + + true + shaded + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-shaded-jar + package + + attach-artifact + + + + + ${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar + jar + shaded + + + + + + + + + diff --git a/pom.xml b/pom.xml index 61f18aeb41b09..1a44f17e0cf2c 100644 --- a/pom.xml +++ b/pom.xml @@ -302,6 +302,7 @@ flexible messaging model and an intuitive client API. 2.3.0 3.4.1 3.1.0 + 3.6.0 1.1.0 1.5.0 3.1.2 @@ -1053,12 +1054,24 @@ flexible messaging model and an intuitive client API. io.etcd jetcd-core ${jetcd.version} + + + io.grpc + grpc-netty + + io.etcd jetcd-test ${jetcd.version} + + + io.grpc + grpc-netty + + @@ -1152,6 +1165,10 @@ flexible messaging model and an intuitive client API. com.squareup.okio okio + + io.grpc + grpc-netty + @@ -2142,6 +2159,11 @@ flexible messaging model and an intuitive client API. docker-maven-plugin ${docker-maven.version} + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + @@ -2387,6 +2409,7 @@ flexible messaging model and an intuitive client API. pulsar-client-messagecrypto-bc pulsar-metadata + jetcd-core-shaded jclouds-shaded @@ -2452,7 +2475,7 @@ flexible messaging model and an intuitive client API. distribution pulsar-metadata - + jetcd-core-shaded pulsar-package-management diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index 73f55710c4f79..110b1b9e1b8d1 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -484,10 +484,42 @@ ${project.version} + + ${project.groupId} + jetcd-core-shaded + ${project.version} + shaded + test + + + io.etcd + jetcd-core + + + + + io.grpc + grpc-netty-shaded + test + io.etcd jetcd-test test + + + io.etcd + jetcd-core + + + io.grpc + grpc-netty + + + io.vertx + * + + diff --git a/pulsar-metadata/pom.xml b/pulsar-metadata/pom.xml index f2566fac653d7..e2f1982f6457a 100644 --- a/pulsar-metadata/pom.xml +++ b/pulsar-metadata/pom.xml @@ -122,15 +122,40 @@ - io.etcd - jetcd-core + ${project.groupId} + jetcd-core-shaded + ${project.version} + shaded + + + io.etcd + jetcd-core + + + + + io.grpc + grpc-netty-shaded - io.etcd jetcd-test test + + + io.etcd + jetcd-core + + + io.grpc + grpc-netty + + + io.vertx + * + + diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java index 194b0d6a2f8a8..3937fd712dc9f 100644 --- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java +++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java @@ -43,10 +43,10 @@ import io.etcd.jetcd.watch.WatchResponse; import io.grpc.Status; import io.grpc.StatusRuntimeException; -import io.grpc.netty.GrpcSslContexts; +import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts; +import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext; +import io.grpc.netty.shaded.io.netty.handler.ssl.SslProvider; import io.grpc.stub.StreamObserver; -import io.netty.handler.ssl.SslContext; -import io.netty.handler.ssl.SslProvider; import java.io.File; import java.io.IOException; import java.io.InputStream; From faebbf2dc8dae48ac14de365cfe692d73a8ace8f Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 14:14:28 +0300 Subject: [PATCH 03/11] Use grpc-netty-shaded for stream-storage-java-client --- pom.xml | 4 ++++ pulsar-functions/instance/pom.xml | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1a44f17e0cf2c..ee0f3bd19c535 100644 --- a/pom.xml +++ b/pom.xml @@ -585,6 +585,10 @@ flexible messaging model and an intuitive client API. jose4j org.bitbucket.b_c + + io.grpc + grpc-netty + diff --git a/pulsar-functions/instance/pom.xml b/pulsar-functions/instance/pom.xml index 99a87963f477f..160885a8ea4d7 100644 --- a/pulsar-functions/instance/pom.xml +++ b/pulsar-functions/instance/pom.xml @@ -101,7 +101,7 @@ io.grpc - grpc-all + * com.google.protobuf @@ -110,6 +110,11 @@ + + io.grpc + grpc-netty-shaded + + io.grpc grpc-stub @@ -215,7 +220,7 @@ - + From b293860ae831d9e0a3132fa70a23b7fb49775588 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 18:03:47 +0300 Subject: [PATCH 04/11] Add dependency-reduced-pom.xml into the shaded jar --- jetcd-core-shaded/pom.xml | 19 +++++++++++++++++++ pulsar-broker/pom.xml | 6 ------ pulsar-metadata/pom.xml | 6 ------ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml index 207fde7a70c4d..57e89876c4b6d 100644 --- a/jetcd-core-shaded/pom.xml +++ b/jetcd-core-shaded/pom.xml @@ -41,6 +41,10 @@ io.grpc grpc-netty + + io.netty + * + @@ -86,9 +90,24 @@ io.grpc.netty.shaded.io.netty + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml + + + + + META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml + ${project.basedir}/dependency-reduced-pom.xml + true diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index 110b1b9e1b8d1..3ad7d20f806e0 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -490,12 +490,6 @@ ${project.version} shaded test - - - io.etcd - jetcd-core - - io.grpc diff --git a/pulsar-metadata/pom.xml b/pulsar-metadata/pom.xml index e2f1982f6457a..538e58059e717 100644 --- a/pulsar-metadata/pom.xml +++ b/pulsar-metadata/pom.xml @@ -126,12 +126,6 @@ jetcd-core-shaded ${project.version} shaded - - - io.etcd - jetcd-core - - io.grpc From f1431db1ebd56669baf46d64c3bdfe246066f19c Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 19:57:01 +0300 Subject: [PATCH 05/11] Add transient jetcd dependencies to jetcd-core-shaded --- jetcd-core-shaded/pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml index 57e89876c4b6d..b54253a72b5d8 100644 --- a/jetcd-core-shaded/pom.xml +++ b/jetcd-core-shaded/pom.xml @@ -51,6 +51,23 @@ io.grpc grpc-netty-shaded + + + io.grpc + grpc-protobuf + + + io.grpc + grpc-stub + + + io.grpc + grpc-grpclb + + + io.grpc + grpc-util + From 9773857eb3082c0218ee563400218756b4413638 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 19:59:16 +0300 Subject: [PATCH 06/11] Add exclusions for jetcd-core-shaded --- pulsar-broker/pom.xml | 18 ++++++++++++++---- pulsar-metadata/pom.xml | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index 3ad7d20f806e0..a6b8d199e0247 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -490,6 +490,16 @@ ${project.version} shaded test + + + io.etcd + * + + + io.vertx + * + + io.grpc @@ -501,14 +511,14 @@ jetcd-test test - - io.etcd - jetcd-core - io.grpc grpc-netty + + io.etcd + * + io.vertx * diff --git a/pulsar-metadata/pom.xml b/pulsar-metadata/pom.xml index 538e58059e717..c63dae7d4b358 100644 --- a/pulsar-metadata/pom.xml +++ b/pulsar-metadata/pom.xml @@ -126,6 +126,16 @@ jetcd-core-shaded ${project.version} shaded + + + io.etcd + * + + + io.vertx + * + + io.grpc @@ -137,14 +147,14 @@ jetcd-test test - - io.etcd - jetcd-core - io.grpc grpc-netty + + io.etcd + * + io.vertx * From 822c87cd7aa80ad6a347146f05069a49a1579d24 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 20:19:37 +0300 Subject: [PATCH 07/11] Define exclusions in dependencyManagement for jetcd-core-shaded --- pom.xml | 29 ++++++++++++++++++++++++++++- pulsar-broker/pom.xml | 24 ------------------------ pulsar-metadata/pom.xml | 24 ------------------------ 3 files changed, 28 insertions(+), 49 deletions(-) diff --git a/pom.xml b/pom.xml index ee0f3bd19c535..71562619c18d5 100644 --- a/pom.xml +++ b/pom.xml @@ -1065,7 +1065,6 @@ flexible messaging model and an intuitive client API. - io.etcd jetcd-test @@ -1075,6 +1074,34 @@ flexible messaging model and an intuitive client API. io.grpc grpc-netty + + io.etcd + jetcd-core + + + io.etcd + jetcd-api + + + io.vertx + * + + + + + ${project.groupId} + jetcd-core-shaded + ${project.version} + shaded + + + io.etcd + * + + + io.vertx + * + diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index a6b8d199e0247..20117ed21db06 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -490,16 +490,6 @@ ${project.version} shaded test - - - io.etcd - * - - - io.vertx - * - - io.grpc @@ -510,20 +500,6 @@ io.etcd jetcd-test test - - - io.grpc - grpc-netty - - - io.etcd - * - - - io.vertx - * - - diff --git a/pulsar-metadata/pom.xml b/pulsar-metadata/pom.xml index c63dae7d4b358..e4a4dd5ec46ab 100644 --- a/pulsar-metadata/pom.xml +++ b/pulsar-metadata/pom.xml @@ -126,16 +126,6 @@ jetcd-core-shaded ${project.version} shaded - - - io.etcd - * - - - io.vertx - * - - io.grpc @@ -146,20 +136,6 @@ io.etcd jetcd-test test - - - io.grpc - grpc-netty - - - io.etcd - * - - - io.vertx - * - - From 3fd06b3626682f1e1f2547c76ae5a7eb34d2e4a4 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 20:26:24 +0300 Subject: [PATCH 08/11] Update LICENSE, jetcd is now shaded --- distribution/server/src/assemble/LICENSE.bin.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 41e1ce82c3596..1a66ab6d70a2f 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -508,11 +508,7 @@ The Apache Software License, Version 2.0 - com.google.http-client-google-http-client-1.41.0.jar - com.google.auto.value-auto-value-annotations-1.10.1.jar - com.google.re2j-re2j-1.7.jar - * Jetcd - - io.etcd-jetcd-api-0.7.7.jar - - io.etcd-jetcd-common-0.7.7.jar - - io.etcd-jetcd-core-0.7.7.jar - - io.etcd-jetcd-grpc-0.7.7.jar + * Jetcd - shaded * IPAddress - com.github.seancfoley-ipaddress-5.5.0.jar * RxJava From b61d9eaefaef03f0ee08287200feb2accf6f8311 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 20:29:49 +0300 Subject: [PATCH 09/11] Ensure that jetcd-core-shaded gets included in the distribution --- distribution/server/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml index adabddfa31da4..c42b0a137850c 100644 --- a/distribution/server/pom.xml +++ b/distribution/server/pom.xml @@ -39,6 +39,19 @@ ${project.version} + + ${project.groupId} + pulsar-metadata + ${project.version} + + + + ${project.groupId} + jetcd-core-shaded + ${project.version} + shaded + + ${project.groupId} pulsar-docs-tools From 9758e59ad2d24d6726168ef4eaf527900339ddb6 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 20:42:22 +0300 Subject: [PATCH 10/11] Add failsafe dependency to jetcd-core-shaded to fix IntelliJ support --- jetcd-core-shaded/pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml index b54253a72b5d8..8aedde07deb96 100644 --- a/jetcd-core-shaded/pom.xml +++ b/jetcd-core-shaded/pom.xml @@ -51,7 +51,11 @@ io.grpc grpc-netty-shaded - + + + dev.failsafe + failsafe + io.grpc grpc-protobuf From 1e043493ac6262f6b51a8e0022aea7f3ad161e18 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 12 Jun 2024 22:17:30 +0300 Subject: [PATCH 11/11] Add workaround that was needed in bookkeeper to support all ways to run tests --- jetcd-core-shaded/pom.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/jetcd-core-shaded/pom.xml b/jetcd-core-shaded/pom.xml index 8aedde07deb96..d8819a1148a21 100644 --- a/jetcd-core-shaded/pom.xml +++ b/jetcd-core-shaded/pom.xml @@ -160,6 +160,28 @@ + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + unpack-shaded-jar + package + + run + + + + + + + + +