Remove lein voom (#384)

.travis.yml

@@ -14,12 +14,10 @@ cache:
     - $HOME/.lein
     - $HOME/.local
     - $HOME/.m2
-    - $HOME/.voom-repos
 
 before_install:
   - unset _JAVA_OPTIONS  # Avoid unwanted _JAVA_OPTIONS set by Travis CI
   - echo "Sudo-enabled build? ${TRAVIS_SUDO}"
-  - voom-build() { lein with-profiles +test voom build-deps; }
 
 install:
   - ./waiter/bin/ci/install-lein
@@ -31,29 +29,29 @@ matrix:
       script: ./bin/ci/run.sh
 
     - env: NAME='Token syncer tests'
-      before_script: cd token-syncer && voom-build
+      before_script: cd token-syncer
       script: ./bin/ci/run-all-tests.sh
 
     - env: NAME='Waiter unit tests'
-      before_script: cd waiter && voom-build
+      before_script: cd waiter
       script: ./bin/ci/run-unit-tests.sh
 
     - env: "NAME='Waiter integration tests: marathon-fast'"
       services: docker
-      before_script: cd waiter && voom-build
+      before_script: cd waiter
       script: ./bin/ci/run-integration-tests.sh parallel-test integration-fast
 
     - env: "NAME='Waiter integration tests: marathon-slow'"
       services: docker
-      before_script: cd waiter && voom-build
+      before_script: cd waiter
       script: ./bin/ci/run-integration-tests.sh parallel-test integration-slow
 
     - env: "NAME='Waiter integration tests: shell-fast'"
       services: docker
-      before_script: cd waiter && voom-build
+      before_script: cd waiter
       script: ./bin/ci/run-integration-tests-shell-scheduler.sh parallel-test integration-fast
 
     - env: "NAME='Waiter integration tests: shell-slow'"
       services: docker
-      before_script: cd waiter && voom-build
+      before_script: cd waiter
       script: ./bin/ci/run-integration-tests-shell-scheduler.sh parallel-test integration-slow

README.md

@@ -30,7 +30,6 @@ The quickest way to get Mesos, Marathon, and Waiter running locally is with [doc
 1. Run `kitchen/bin/build-docker-image.sh` to build the minimesos agent image with kitchen baked in
 1. `cd waiter`
 1. Run `minimesos up` to start Mesos, ZooKeeper, and Marathon
-1. Run `lein voom build-deps` to fetch dependencies
 1. Run `bin/run-using-minimesos.sh` to start Waiter
 1. Waiter should now be listening locally on port 9091
 
@@ -40,7 +39,6 @@ Waiter can also be run without Mesos and Marathon, using the "shell scheduler".
 
 1. Clone down this repo
 1. `cd waiter`
-1. Run `lein voom build-deps` to fetch dependencies
 1. Run `bin/run-using-shell-scheduler.sh` to start Waiter
 1. Waiter should now be listening locally on port 9091
 

token-syncer/bin/ci/run-integration-tests.sh

@@ -19,7 +19,6 @@ SYNCER_DIR=${WAITER_DIR}/../token-syncer
 
 pushd ${WAITER_DIR}
 
-lein voom build-deps
 lein do clean, compile
 
 # Start waiter servers

token-syncer/project.clj

@@ -14,8 +14,7 @@
 ;; limitations under the License.
 ;;
 (defproject token-syncer "0.1.0-SNAPSHOT"
-  :dependencies [^{:voom {:repo "https://github.com/twosigma/jet.git" :branch "waiter-patch"}}
-                 [cc.qbits/jet "0.7.10-20180626_194651-g716c5e0"]
+  :dependencies [[twosigma/jet "0.7.10-20180627_133335-g2a9429e"]
                  [clj-time "0.12.0"]
                  [commons-codec/commons-codec "1.10"]
                  [org.clojure/clojure "1.8.0"]
@@ -28,7 +27,6 @@
              "-XX:+UseG1GC"
              "-XX:MaxGCPauseMillis=50"]
   :main ^:skip-aot token-syncer.main
-  :plugins [[lein-voom "0.1.0-20171225_233657-g7962d1d"]]
   :profiles {:default {:jvm-opts ["-Dlog4j.configuration=log4j.properties"]}
              :spnego {:jvm-opts ["-Djava.security.krb5.conf=/etc/krb5.conf"
                                  "-Djavax.security.auth.useSubjectCredsOnly=false"

waiter/README.md

@@ -9,16 +9,10 @@ Prerequisites:
 * Java 8
 * [Leiningen](http://leiningen.org/) v2.8.1
 
-Waiter uses [voom](https://github.com/LonoCloud/lein-voom) to pull in dependencies that are not available in clojars:
+If you want to override the default directories for local maven repos:
 
 ```bash
-$ lein voom build-deps
-```
-
-If you want to override the default directories for local maven and voom repos:
-
-```bash
-$ WAITER_MAVEN_LOCAL_REPO=... VOOM_REPOS=... lein with-profile +override-maven voom build-deps
+$ WAITER_MAVEN_LOCAL_REPO=... lein with-profile +override-maven deps
 ```
 
 Once you have fetched dependencies:

waiter/project.clj

@@ -32,10 +32,8 @@
 
   :dependencies [[bidi "2.0.16"
                   :exclusions [prismatic/schema ring/ring-core]]
-                 ^{:voom {:repo "https://github.com/twosigma/jet.git" :branch "waiter-patch"}}
-                 [cc.qbits/jet "0.7.10-20180626_194651-g716c5e0"]
-                 ^{:voom {:repo "https://github.com/twosigma/clj-http.git" :branch "waiter-patch"}}
-                 [clj-http "1.0.2-20180124_201819-gcdf23e5"
+                 [twosigma/jet "0.7.10-20180627_133335-g2a9429e"]
+                 [twosigma/clj-http "1.0.2-20180124_201819-gcdf23e5"
                   :exclusions [commons-io org.clojure/tools.reader potemkin slingshot]]
                  [clj-time "0.12.0"
                   :exclusions
@@ -53,8 +51,7 @@
                    clj-time/clj-time
                    org.clojure/core.async]]
                  [joda-time "2.9.4"]
-                 ^{:voom {:repo "https://github.com/twosigma/metrics-clojure.git" :branch "waiter-patch"}}
-                 [metrics-clojure "2.6.0-20180124_201441-g72cee16"
+                 [twosigma/metrics-clojure "2.6.0-20180124_201441-g72cee16"
                   :exclusions [org.clojure/clojure io.netty/netty org.slf4j/slf4j-api]]
                  [metrics-clojure-jvm "2.6.0"
                   :exclusions [io.dropwizard.metrics/metrics-core
@@ -96,9 +93,7 @@
 
   :resource-paths ["resources"]
   :main waiter.main
-  :plugins [[lein-voom "0.1.0-20171225_233657-g7962d1d"
-             :exclusions [org.clojure/clojure]]
-            [test2junit "1.2.2"]
+  :plugins [[test2junit "1.2.2"]
             [com.holychao/parallel-test "0.3.1"]]
   ; In case of kerberos problems, export KRB5_KTNAME=/var/spool/keytabs/$(id -un)
   :jvm-opts ["-server"