diff options
| author | jonmv <venstad@gmail.com> | 2023-12-13 12:00:00 +0100 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-12-14 15:29:22 +0100 |
| commit | 87770f47457385aef9b9c4e490865a85849fa39c (patch) | |
| tree | 285782baff6aaaea0db92bcad08374ae8954e68c | |
| parent | 4576e6d67df0d48f963f05cb2091d0eb66d4ca90 (diff) | |
Embed ZK in zookeeper-client-common
| -rw-r--r-- | clustercontroller-core/pom.xml | 10 | ||||
| -rw-r--r-- | zkfacade/pom.xml | 14 | ||||
| -rw-r--r-- | zookeeper-client-common/pom.xml | 15 | ||||
| -rw-r--r-- | zookeeper-command-line-client/pom.xml | 4 | ||||
| -rw-r--r-- | zookeeper-server/zookeeper-server-3.8.0/pom.xml | 2 | ||||
| -rw-r--r-- | zookeeper-server/zookeeper-server/pom.xml | 2 |
6 files changed, 23 insertions, 24 deletions
diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 7f845a26c73..4cbe98bad22 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -96,12 +96,18 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> + <!--dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>zookeeper-client-common</artifactId> <version>${project.version}</version> <scope>compile</scope> - </dependency> + <exclusions> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + </exclusion> + </dependency--> <dependency> <!-- Not used by this module, but compilation fails without it because zookeeper uses these annotations. Provided scoped here to avoid dependents getting it transitively. --> diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index daaa7dfa14f..7f19a4be80c 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -57,20 +57,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <exclusions> - <!-- - Container provides wiring for all common log libraries - Duplicate embedding results in various warnings being printed to stderr - --> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> <!-- snappy-java and metrics-core are included here to be able to work with ZooKeeper >= 3.6.2 due to class loading issues --> diff --git a/zookeeper-client-common/pom.xml b/zookeeper-client-common/pom.xml index 12ff1517e53..b425dfddaf9 100644 --- a/zookeeper-client-common/pom.xml +++ b/zookeeper-client-common/pom.xml @@ -20,13 +20,24 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + + <!-- compile scope --> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <scope>provided</scope> + <scope>compile</scope> + <exclusions> + <!-- + Container provides wiring for all common log libraries + Duplicate embedding results in various warnings being printed to stderr + --> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> - <!-- compile scope --> <!-- test scope --> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml index dae8fdc671b..c857eb71f0b 100644 --- a/zookeeper-command-line-client/pom.xml +++ b/zookeeper-command-line-client/pom.xml @@ -12,10 +12,6 @@ <version>8-SNAPSHOT</version> <dependencies> <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>zookeeper-client-common</artifactId> <version>${project.version}</version> diff --git a/zookeeper-server/zookeeper-server-3.8.0/pom.xml b/zookeeper-server/zookeeper-server-3.8.0/pom.xml index 2037b9cf7c5..37ee5996f5e 100644 --- a/zookeeper-server/zookeeper-server-3.8.0/pom.xml +++ b/zookeeper-server/zookeeper-server-3.8.0/pom.xml @@ -26,7 +26,7 @@ <version>${project.version}</version> <exclusions> <exclusion> - <!-- Don't use ZK version from zookeeper-client-common --> + <!-- Don't embed ZK from zookeeper-client-common --> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> </exclusion> diff --git a/zookeeper-server/zookeeper-server/pom.xml b/zookeeper-server/zookeeper-server/pom.xml index 77aec63a781..945f7852bc7 100644 --- a/zookeeper-server/zookeeper-server/pom.xml +++ b/zookeeper-server/zookeeper-server/pom.xml @@ -26,7 +26,7 @@ <version>${project.version}</version> <exclusions> <exclusion> - <!-- Don't use ZK version from zookeeper-client-common --> + <!-- Don't embed ZK from zookeeper-client-common --> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> </exclusion> |