diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-10-17 11:09:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-17 11:09:00 +0200 |
commit | 0a64bb0589f71f180041abb17b2271cc06a4a8f8 (patch) | |
tree | 840f578d85378544227b04b0c8faebc057926354 | |
parent | aab6f6789c6529fc106aeb7249cf7ba3db63715f (diff) | |
parent | a344087a34f7909a1b5f1b69d1a861c32f81c321 (diff) |
Merge pull request #11003 from vespa-engine/hmusum/add-zookeeper-server-module
Add zookeeper-server module
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | pom.xml | 1 | ||||
-rw-r--r-- | zookeeper-server/CMakeLists.txt | 2 | ||||
-rw-r--r-- | zookeeper-server/README | 1 | ||||
-rw-r--r-- | zookeeper-server/pom.xml | 86 |
5 files changed, 91 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45251af7b00..9afb1819025 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,6 +131,7 @@ endif() add_subdirectory(vsm) add_subdirectory(zkfacade) add_subdirectory(zookeeper-command-line-client) +add_subdirectory(zookeeper-server) # Add any extra projects add_extra_projects() @@ -141,6 +141,7 @@ <module>yolean</module> <module>zkfacade</module> <module>zookeeper-command-line-client</module> + <module>zookeeper-server</module> <module>hosted-api</module> </modules> </project> diff --git a/zookeeper-server/CMakeLists.txt b/zookeeper-server/CMakeLists.txt new file mode 100644 index 00000000000..2065949abd4 --- /dev/null +++ b/zookeeper-server/CMakeLists.txt @@ -0,0 +1,2 @@ +# Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +install_fat_java_artifact(zookeeper-server) diff --git a/zookeeper-server/README b/zookeeper-server/README new file mode 100644 index 00000000000..9bf49ab7f87 --- /dev/null +++ b/zookeeper-server/README @@ -0,0 +1 @@ +Vespa ZooKeeper server interface diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml new file mode 100644 index 00000000000..54d73b8a702 --- /dev/null +++ b/zookeeper-server/pom.xml @@ -0,0 +1,86 @@ +<?xml version="1.0"?> +<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.yahoo.vespa</groupId> + <artifactId>parent</artifactId> + <version>7-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <artifactId>zookeeper-server</artifactId> + <packaging>container-plugin</packaging> + <version>7-SNAPSHOT</version> + <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> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArgs> + <arg>-Xlint:all</arg> + <arg>-Werror</arg> + </compilerArgs> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile> + <forkMode>once</forkMode> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <updateReleaseInfo>true</updateReleaseInfo> + </configuration> + </plugin> + <plugin> + <groupId>com.yahoo.vespa</groupId> + <artifactId>bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <importPackage>com.sun.management</importPackage> + </configuration> + </plugin> + </plugins> + </build> +</project> |