From a1a482050ac224e299765c98bac064428059a345 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Sun, 16 Aug 2020 16:04:14 +0200
Subject: Upgrade to Curator 4

---
 node-repository/pom.xml                                             | 6 ++++++
 .../vespa/hosted/provision/persistence/CuratorDatabaseTest.java     | 1 +
 2 files changed, 7 insertions(+)

(limited to 'node-repository')

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();
-- 
cgit v1.2.3