diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-08-16 16:04:14 +0200 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2020-08-16 16:04:14 +0200 |
| commit | a1a482050ac224e299765c98bac064428059a345 (patch) | |
| tree | 45fe12eece68093f97f87d3b202177662a21a6d6 /node-repository | |
| parent | 64a5c07ce69e62377488f9d2e5f183418e2564b8 (diff) | |
Upgrade to Curator 4
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/pom.xml | 6 | ||||
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseTest.java | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/node-repository/pom.xml b/node-repository/pom.xml index 75bff479f42..fc4d02ca574 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -118,6 +118,12 @@ <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseTest.java index 149510bdc97..44026f835dd 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseTest.java @@ -149,6 +149,7 @@ public class CuratorDatabaseTest { this.task = task; } + @SuppressWarnings("deprecation") @Override public org.apache.curator.framework.api.transaction.CuratorTransaction and(org.apache.curator.framework.api.transaction.CuratorTransaction transaction) { task.run(); |