diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-10-27 06:41:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 06:41:42 +0100 |
| commit | ff47f5d753f02361b9eb25f6e39ebfff8d9e1e57 (patch) | |
| tree | e76537b3df36a8791570c9fb17240d1795155dae /zookeeper-server/pom.xml | |
| parent | 64cce27a240e076ea99fe63fa439795fbb220ae3 (diff) | |
| parent | 19987a0f2da4256cee40ef66e2c3387c7c70d026 (diff) | |
Merge pull request #11119 from vespa-engine/revert-11118-revert-11117-revert-11115-revert-11113-revert-11112-revert-11101-revert-11098-revert-11096-revert-11095-revert-11089-hmusum/create-versioned-zookeeper-bundles
Reapply "Create seperate bundles compiled against different ZooKeeper versions"
Diffstat (limited to 'zookeeper-server/pom.xml')
| -rw-r--r-- | zookeeper-server/pom.xml | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index 3ccda41d1b9..fe182645681 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -9,48 +9,20 @@ <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>zookeeper-server</artifactId> - <packaging>container-plugin</packaging> + <packaging>pom</packaging> <version>7-SNAPSHOT</version> + <modules> + <module>zookeeper-server-common</module> + <module>zookeeper-server-3.4</module> + <module>zookeeper-server-3.5</module> + </modules> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>defaults</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespajlib</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespalog</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </dependency> - <dependency> - <!-- Needed to have the same version as slf4j-api --> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.7.5</version> - </dependency> </dependencies> <build> <plugins> |