|
5 | 5 |
|
6 | 6 | :min-lein-version "2.9.1" |
7 | 7 |
|
8 | | - :parent-project {:coords [org.openvoxproject/clj-parent "7.6.0-SNAPSHOT"] |
| 8 | + :parent-project {:coords [org.openvoxproject/clj-parent "7.6.3"] |
9 | 9 | :inherit [:managed-dependencies]} |
10 | 10 |
|
11 | 11 | ;; Abort when version ranges or version conflicts are detected in |
|
38 | 38 | :defaults {:dependencies [[cheshire] |
39 | 39 | [org.openvoxproject/kitchensink :classifier "test"] |
40 | 40 | [org.openvoxproject/trapperkeeper] |
41 | | - [org.openvoxproject/trapperkeeper :classifier "test"] |
42 | | - [org.openvoxproject/trapperkeeper-webserver-jetty10] |
43 | | - [org.openvoxproject/trapperkeeper-webserver-jetty10 :classifier "test"] |
44 | | - [org.openvoxproject/ring-middleware]] |
| 41 | + [org.openvoxproject/trapperkeeper :classifier "test"]] |
45 | 42 | :resource-paths ["dev-resources"] |
46 | 43 | :jvm-opts ["-Djava.util.logging.config.file=dev-resources/logging.properties"]} |
47 | 44 | :dev-deps {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]} |
48 | 45 | :dev [:defaults :dev-deps] |
| 46 | + ;; These dependencies are only used for tests. When we are doing clj-parent updates and updating |
| 47 | + ;; trapperkeeper-webserver-jetty10 and/or ring-middleware at the same time as updating this project |
| 48 | + ;; we end up with circular dependency issues, since we have to make version bumps in clj-parent first. |
| 49 | + ;; To avoid this, we pull in whatever the latest we can find on clojars is at test time, since it shouldn't |
| 50 | + ;; matter too terribly much. Ignore the warning that appears when runninng `lein test`. |
| 51 | + :test {:pedantic? :warn |
| 52 | + :dependencies [[org.openvoxproject/trapperkeeper-webserver-jetty10 "[1.0.0,)"] |
| 53 | + [org.openvoxproject/trapperkeeper-webserver-jetty10 "[1.0.0,)":classifier "test"] |
| 54 | + [org.openvoxproject/ring-middleware "[2.0.0,)"]]} |
49 | 55 | :fips-deps {:dependencies [[org.bouncycastle/bcpkix-fips] |
50 | 56 | [org.bouncycastle/bc-fips] |
51 | 57 | [org.bouncycastle/bctls-fips]] |
|
76 | 82 |
|
77 | 83 | :plugins [[lein-parent "0.3.9"] |
78 | 84 | [jonase/eastwood "1.4.3" :exclusions [org.clojure/clojure]] |
79 | | - [org.openvoxproject/i18n "1.0.0-SNAPSHOT"]] |
| 85 | + [org.openvoxproject/i18n "1.0.2"]] |
80 | 86 |
|
81 | 87 | :eastwood {:continue-on-exception true |
82 | 88 | :exclude-namespaces [;; linting this test throws and exception as test-utils/load-test-config |
|
0 commit comments