diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2019-10-22 10:06:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 10:06:11 +0200 |
| commit | 4c5443f83bd82d61fd42630bffffceaad516bacb (patch) | |
| tree | 2de96057057b40142af041bd73f7dfab46285af2 /configserver | |
| parent | 92e034562a0d0ff8f0ae144074a93b782140c950 (diff) | |
Revert "Reapply "move ZooKeeperServer to another module""
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | configserver/pom.xml | 6 | ||||
| -rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt index 54961945407..8f939e54d55 100644 --- a/configserver/CMakeLists.txt +++ b/configserver/CMakeLists.txt @@ -20,5 +20,4 @@ install_symlink(lib/jars/service-monitor-jar-with-dependencies.jar conf/configse install_symlink(lib/jars/application-model-jar-with-dependencies.jar conf/configserver-app/components/application-model.jar) install_symlink(lib/jars/node-repository-jar-with-dependencies.jar conf/configserver-app/components/node-repository.jar) install_symlink(lib/jars/zkfacade-jar-with-dependencies.jar conf/configserver-app/components/zkfacade.jar) -install_symlink(lib/jars/zookeeper-server-jar-with-dependencies.jar conf/configserver-app/components/zookeeper-server.jar) install_symlink(conf/configserver-app/components lib/jars/config-models) diff --git a/configserver/pom.xml b/configserver/pom.xml index de7fe02452f..778b6264f5e 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -191,12 +191,6 @@ <scope>compile</scope> <!-- TODO Should ideally be provided, but this bundle is not installed as part of configserver. Orchestrator bundle also includes jaxrs_client_utils in compile scope --> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>zookeeper-server</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <scope>provided</scope> diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index 25e6a727841..97b2156e8ca 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -11,7 +11,7 @@ <component id="com.yahoo.vespa.config.server.ConfigServerBootstrap" bundle="configserver" /> <component id="com.yahoo.vespa.config.server.monitoring.Metrics" bundle="configserver" /> - <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zookeeper-server" /> + <component id="com.yahoo.vespa.zookeeper.ZooKeeperServer" bundle="zkfacade" /> <component id="com.yahoo.vespa.config.server.rpc.RpcServer" bundle="configserver" /> <component id="com.yahoo.vespa.config.server.ConfigServerDB" bundle="configserver" /> <component id="com.yahoo.vespa.config.server.session.FileDistributionFactory" bundle="configserver" /> |