Skip to content

Commit 6c2d77f

Browse files
authored
Merge pull request #28 from OpenVoxProject/remove_clj_parent
Remove clj-parent
2 parents c5e44ed + ded9d72 commit 6c2d77f

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

project.clj

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,29 @@
66

77
:min-lein-version "2.9.1"
88

9-
:parent-project {:coords [org.openvoxproject/clj-parent "7.6.3"]
10-
:inherit [:managed-dependencies]}
11-
129
;; Abort when version ranges or version conflicts are detected in
1310
;; dependencies. Also supports :warn to simply emit warnings.
1411
;; requires lein 2.2.0+.
1512
:pedantic? :abort
1613

14+
;; These are to enforce consistent versions across dependencies of dependencies,
15+
;; and to avoid having to define versions in multiple places. If a component
16+
;; defined under :dependencies ends up causing an error due to :pedantic? :abort,
17+
;; because it is a dep of a dep with a different version, move it here.
18+
:managed-dependencies [[org.clojure/clojure "1.12.4"]]
19+
1720
:dependencies [[org.clojure/clojure]
18-
[org.clojure/tools.logging]
19-
[org.clojure/tools.cli]
21+
[org.clojure/tools.logging "1.2.4"]
22+
[org.clojure/tools.cli "1.0.206"]
2023

21-
[org.apache.commons/commons-compress]
22-
[clj-time]
23-
[clj-commons/fs]
24-
[slingshot]
25-
[cheshire]
24+
[org.apache.commons/commons-compress "1.28.0"]
25+
[clj-time "0.11.0"]
26+
[clj-commons/fs "1.6.312"]
27+
[slingshot "0.12.2"]
28+
[cheshire "5.10.2"]
2629

2730
[org.ini4j/ini4j "0.5.4"]
28-
[org.tcrawley/dynapath]
31+
[org.tcrawley/dynapath "1.1.0"]
2932
[digest "1.4.10"]]
3033

3134
;; By declaring a classifier here and a corresponding profile below we'll get an additional jar
@@ -38,8 +41,7 @@
3841

3942
;; this plugin is used by jenkins jobs to interrogate the project version
4043
:plugins [[lein-project-version "0.1.0"]
41-
[jonase/eastwood "1.4.3" :exclusions [org.clojure/clojure]]
42-
[lein-parent "0.3.9"]]
44+
[jonase/eastwood "1.4.3" :exclusions [org.clojure/clojure]]]
4345

4446
:eastwood {:ignored-faults {:unused-ret-vals {puppetlabs.kitchensink.classpath [{:line 93}]}
4547
:deprecations {puppetlabs.kitchensink.classpath [{:line 66}

0 commit comments

Comments
 (0)