Skip to content

Commit 097c7ef

Browse files
authored
Merge pull request #3 from OpenVoxProject/remove_clj_parent
Remove clj-parent
2 parents 4d84cd9 + 58b3e84 commit 097c7ef

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

project.clj

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
(defproject org.openvoxproject/ring-middleware "2.1.1-SNAPSHOT"
2-
:dependencies [[cheshire]
3-
[org.openvoxproject/http-client]]
2+
3+
;; These are to enforce consistent versions across dependencies of dependencies,
4+
;; and to avoid having to define versions in multiple places. If a component
5+
;; defined under :dependencies ends up causing an error due to :pedantic? :abort,
6+
;; because it is a dep of a dep with a different version, move it here.
7+
:managed-dependencies [[org.clojure/clojure "1.12.4"]
8+
[ring/ring-codec "1.1.2"]
9+
[commons-codec "1.15"]
10+
[org.slf4j/slf4j-api "2.0.17"]]
11+
12+
:dependencies [[cheshire "5.10.2"]
13+
[org.openvoxproject/http-client "2.2.0"]]
414

515
:min-lein-version "2.7.1"
616

7-
:parent-project {:coords [org.openvoxproject/clj-parent "7.6.3"]
8-
:inherit [:managed-dependencies]}
917
:license {:name "Apache-2.0"
1018
:url "https://www.apache.org/licenses/LICENSE-2.0.txt"}
1119

@@ -14,16 +22,15 @@
1422
;; requires lein 2.2.0+.
1523
:pedantic? :abort
1624

17-
:plugins [[lein-parent "0.3.9"]
18-
[org.openvoxproject/i18n "1.0.2"]]
25+
:plugins [[org.openvoxproject/i18n "1.0.2"]]
1926

2027
:deploy-repositories [["releases" {:url "https://clojars.org/repo"
2128
:username :env/CLOJARS_USERNAME
2229
:password :env/CLOJARS_PASSWORD
2330
:sign-releases false}]]
2431

25-
:profiles {:dev {:dependencies [[org.openvoxproject/trapperkeeper-webserver-jetty10]
26-
[org.bouncycastle/bcpkix-jdk18on]
27-
[org.openvoxproject/kitchensink nil :classifier "test" :scope "test"]
28-
[org.openvoxproject/trapperkeeper nil :classifier "test" :scope "test"]
29-
[compojure]]}})
32+
:profiles {:dev {:dependencies [[org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.0"]
33+
[org.bouncycastle/bcpkix-jdk18on "1.83"]
34+
[org.openvoxproject/kitchensink "3.5.3" :classifier "test" :scope "test"]
35+
[org.openvoxproject/trapperkeeper "4.3.0" :classifier "test" :scope "test"]
36+
[compojure "1.7.1"]]}})

0 commit comments

Comments
 (0)