diff options
-rw-r--r-- | application/pom.xml | 5 | ||||
-rw-r--r-- | athenz-identity-provider-service/pom.xml | 7 | ||||
-rw-r--r-- | node-admin/pom.xml | 7 | ||||
-rw-r--r-- | parent/pom.xml | 4 | ||||
-rw-r--r-- | zkfacade/pom.xml | 4 |
5 files changed, 20 insertions, 7 deletions
diff --git a/application/pom.xml b/application/pom.xml index 20b754fc236..5a370e9ffe6 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -54,11 +54,6 @@ <artifactId>container-search-gui</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>zkfacade</artifactId> - <version>${project.version}</version> - </dependency> <!-- Because these are provided in jdisc_http_service and just preinstalled: --> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index 1b1edcc64b8..501904a1d62 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -127,6 +127,13 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <!-- Needed for node repo mock --> + <groupId>com.yahoo.vespa</groupId> + <artifactId>zkfacade</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 1188cd9fb76..7cc4c22b417 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -137,6 +137,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <!-- Needed for node repo mock --> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>zkfacade</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/parent/pom.xml b/parent/pom.xml index 1b22bcefb18..7efe36e73f7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -505,14 +505,14 @@ <artifactId>commons-pool</artifactId> <version>1.5.6</version> </dependency> - <!-- Explicitly included to get Zookeeper version 3.4.13, + <!-- Explicitly included to get Zookeeper version 3.4.14, can be excluded if you want the Zookeeper version used by curator by default --> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.13</version> + <version>3.4.14</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index c57ab45e6c6..2e016e71132 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -65,6 +65,10 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </dependency> </dependencies> <build> <plugins> |