diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-25 10:38:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 10:38:12 +0200 |
| commit | 396e8a825afb061dffe85c3bdacc408ce2c159fd (patch) | |
| tree | 3e51d5a3ecabae8a2df6cd1ae245ad0395b90e26 /zookeeper-server/pom.xml | |
| parent | a7941c6269115e54914fed2258f62526f1eb887a (diff) | |
| parent | 26d4a66c3695e40e6a7e532d490f40180e0da6ea (diff) | |
Merge pull request #11095 from vespa-engine/revert-11089-hmusum/create-versioned-zookeeper-bundles
Revert "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, 34 insertions, 6 deletions
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index fe182645681..3ccda41d1b9 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -9,20 +9,48 @@ <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>zookeeper-server</artifactId> - <packaging>pom</packaging> + <packaging>container-plugin</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> |