Skip to content

Commit f5fbb65

Browse files
committed
Move trapperkeeper-webserver-jetty10 and ring-middleware into a test profile
Since these are only used for tests, and since we run into circular dependency issues when we're trying to update all the dependencies, this lets tests pull the latest version it can find from clojars instead.
1 parent a298242 commit f5fbb65

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

project.clj

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
:min-lein-version "2.9.1"
77

8-
:parent-project {:coords [org.openvoxproject/clj-parent "7.6.0-SNAPSHOT"]
8+
:parent-project {:coords [org.openvoxproject/clj-parent "7.6.3"]
99
:inherit [:managed-dependencies]}
1010

1111
;; Abort when version ranges or version conflicts are detected in
@@ -38,14 +38,20 @@
3838
:defaults {:dependencies [[cheshire]
3939
[org.openvoxproject/kitchensink :classifier "test"]
4040
[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"]]
4542
:resource-paths ["dev-resources"]
4643
:jvm-opts ["-Djava.util.logging.config.file=dev-resources/logging.properties"]}
4744
:dev-deps {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}
4845
: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,)"]]}
4955
:fips-deps {:dependencies [[org.bouncycastle/bcpkix-fips]
5056
[org.bouncycastle/bc-fips]
5157
[org.bouncycastle/bctls-fips]]
@@ -76,7 +82,7 @@
7682

7783
:plugins [[lein-parent "0.3.9"]
7884
[jonase/eastwood "1.4.3" :exclusions [org.clojure/clojure]]
79-
[org.openvoxproject/i18n "1.0.0-SNAPSHOT"]]
85+
[org.openvoxproject/i18n "1.0.2"]]
8086

8187
:eastwood {:continue-on-exception true
8288
:exclude-namespaces [;; linting this test throws and exception as test-utils/load-test-config

0 commit comments

Comments
 (0)