upgrades apache curator version

twosigma · Sep 22, 2022 · 677ea49 · 677ea49
1 parent d9c4fb7
commit 677ea49
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/waiter/project.clj b/waiter/project.clj
@@ -37,21 +37,21 @@
                  ;; resolve the cheshire dependency used by buddy and jet
                  [cheshire "5.10.0"]
                  [twosigma/courier "1.5.19"
-                  :exclusions [com.google.guava/guava io.grpc/grpc-core]
+                  :exclusions [com.google.errorprone/error_prone_annotations com.google.guava/guava io.grpc/grpc-core]
                   :scope "test"]
                  ;; avoids the following:
                  ;; WARNING!!! version ranges found for:
                  ;; [com.twosigma.waiter/courier ...] -> [io.grpc/grpc-netty-shaded "1.20.0"] -> [io.grpc/grpc-core "[1.20.0,1.20.0]"]
                  [io.grpc/grpc-core "1.20.0"
-                  :exclusions [com.google.guava/guava]
+                  :exclusions [com.google.errorprone/error_prone_annotations com.google.guava/guava]
                   :scope "test"]
                  [twosigma/jet "0.7.10-20220829_161214-g1f873ca"
                   :exclusions [org.mortbay.jetty.alpn/alpn-boot]]
                  [twosigma/clj-http "1.0.2-20180124_201819-gcdf23e5"
                   :exclusions [commons-codec commons-io org.clojure/tools.reader potemkin slingshot]]
                  [clj-time "0.15.2"
                   :exclusions [joda-time]]
-                 [com.google.guava/guava "20.0"] ;; apache curator dependency prevents upgrade to newer versions
+                 [com.google.guava/guava "27.0.1-jre"] ;; apache curator dependency prevents upgrade to newer versions
                  [com.taoensso/nippy "2.14.0"
                   :exclusions [org.clojure/clojure org.clojure/tools.reader]]
                  [comb "0.1.1"
@@ -71,15 +71,16 @@
                                metrics-clojure
                                org.clojure/clojure
                                org.slf4j/slf4j-api]]
-                 [org.apache.curator/curator-framework "2.11.0"
-                  :exclusions [io.netty/netty org.slf4j/slf4j-api]]
-                 [org.apache.curator/curator-recipes "2.11.0"
-                  :exclusions [io.netty/netty org.slf4j/slf4j-api]]
-                 [org.apache.curator/curator-test "2.11.0"
-                  :exclusions [com.google.guava/guava
-                               io.netty/netty]]
-                 [org.apache.curator/curator-x-discovery "2.11.0"
-                  :exclusions [io.netty/netty org.slf4j/slf4j-api]]
+                 [org.apache.curator/curator-framework "4.2.0"
+                  :exclusions [io.netty/netty org.apache.zookeeper/zookeeper org.slf4j/slf4j-api]]
+                 [org.apache.curator/curator-recipes "4.2.0"
+                  :exclusions [io.netty/netty org.apache.zookeeper/zookeeper org.slf4j/slf4j-api]]
+                 [org.apache.curator/curator-test "2.12.0"
+                  :exclusions [com.google.guava/guava io.netty/netty org.apache.zookeeper/zookeeper]]
+                 [org.apache.curator/curator-x-discovery "4.2.0"
+                  :exclusions [io.netty/netty org.apache.zookeeper/zookeeper org.slf4j/slf4j-api]]
+                 [org.apache.zookeeper/zookeeper "3.4.10"
+                  :exclusions [org.slf4j/slf4j-api]]
                  [org.clojure/clojure "1.10.3"]
                  [org.clojure/core.async "1.5.648"
                   :exclusions [org.clojure/clojure org.clojure/tools.reader]]