Skip to content

Commit 685b67f

Browse files
bastelfreakbastelfreak
authored
Merge pull request #114 from OpenVoxProject/remove_clj_parent
Remove clj-parent
2 parents 57bc26c + d5c9fd0 commit 685b67f

1 file changed

Lines changed: 78 additions & 32 deletions

File tree

‎project.clj‎

Lines changed: 78 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515
heap-size-from-profile-clj
1616
default-heap-size))
1717

18+
(def slf4j-version "2.0.17")
19+
(def kitchensink-version "3.5.3")
20+
(def trapperkeeper-version "4.3.0")
21+
(def trapperkeeper-webserver-jetty10-version "1.1.0")
22+
(def trapperkeeper-metrics-version "2.1.0")
23+
(def rbac-client-version "1.2.0")
24+
(def i18n-version "1.0.2")
25+
(def logback-version "1.3.16")
26+
(def jackson-version "2.15.4")
1827
(defproject org.openvoxproject/puppetserver ps-version
1928
:description "OpenVox Server"
2029

@@ -23,45 +32,83 @@
2332

2433
:min-lein-version "2.9.1"
2534

26-
:parent-project {:coords [org.openvoxproject/clj-parent "7.6.4"]
27-
:inherit [:managed-dependencies]}
35+
;; These are to enforce consistent versions across dependencies of dependencies,
36+
;; and to avoid having to define versions in multiple places. If a component
37+
;; defined under :dependencies ends up causing an error due to :pedantic? :abort,
38+
;; because it is a dep of a dep with a different version, move it here.
39+
:managed-dependencies [[org.clojure/clojure "1.12.4"]
40+
[org.slf4j/slf4j-api ~slf4j-version]
41+
[org.slf4j/jul-to-slf4j ~slf4j-version]
42+
[org.slf4j/log4j-over-slf4j ~slf4j-version]
43+
44+
[ch.qos.logback/logback-classic ~logback-version]
45+
[ch.qos.logback/logback-core ~logback-version]
46+
[ch.qos.logback/logback-access ~logback-version]
47+
48+
[com.fasterxml.jackson.core/jackson-core ~jackson-version]
49+
[com.fasterxml.jackson.core/jackson-databind ~jackson-version]
50+
[com.fasterxml.jackson.core/jackson-annotations ~jackson-version]
51+
[com.fasterxml.jackson.module/jackson-module-afterburner ~jackson-version]
52+
53+
[ring/ring-core "1.8.2"]
54+
[ring/ring-codec "1.1.2"]
55+
[commons-codec "1.15"]
56+
[io.dropwizard.metrics/metrics-core "3.2.2"]
57+
[org.ow2.asm/asm "9.7.1"]
58+
59+
[org.bouncycastle/bcpkix-jdk18on "1.83"]
60+
[org.bouncycastle/bcpkix-fips "1.0.8"]
61+
[org.bouncycastle/bc-fips "1.0.2.6"]
62+
[org.bouncycastle/bctls-fips "1.0.19"]
63+
64+
[org.openvoxproject/kitchensink ~kitchensink-version]
65+
[org.openvoxproject/kitchensink ~kitchensink-version :classifier "test"]
66+
[org.openvoxproject/trapperkeeper ~trapperkeeper-version]
67+
[org.openvoxproject/trapperkeeper ~trapperkeeper-version :classifier "test"]
68+
[org.openvoxproject/trapperkeeper-webserver-jetty10 ~trapperkeeper-webserver-jetty10-version]
69+
[org.openvoxproject/trapperkeeper-webserver-jetty10 ~trapperkeeper-webserver-jetty10-version :classifier "test"]
70+
[org.openvoxproject/trapperkeeper-metrics ~trapperkeeper-metrics-version]
71+
[org.openvoxproject/trapperkeeper-metrics ~trapperkeeper-metrics-version :classifier "test"]
72+
[org.openvoxproject/jruby-utils "5.3.1"]
73+
[org.openvoxproject/rbac-client ~rbac-client-version]
74+
[org.openvoxproject/rbac-client ~rbac-client-version :classifier "test"]]
2875

2976
:dependencies [[org.clojure/clojure]
3077

31-
[slingshot]
32-
[org.yaml/snakeyaml]
33-
[commons-io]
78+
[slingshot "0.12.2"]
79+
[org.yaml/snakeyaml "2.0"]
80+
[commons-io "2.20.0"]
3481

35-
[clj-time]
82+
[clj-time "0.11.0"]
3683
[grimradical/clj-semver "0.3.0" :exclusions [org.clojure/clojure]]
37-
[prismatic/schema]
38-
[clj-commons/fs]
39-
[liberator]
40-
[org.apache.commons/commons-exec]
84+
[prismatic/schema "1.1.12"]
85+
[clj-commons/fs "1.6.312"]
86+
[liberator "0.15.3"]
87+
[org.apache.commons/commons-exec "1.4.0"]
4188
[io.dropwizard.metrics/metrics-core]
4289

4390
;; We do not currently use this dependency directly, but
4491
;; we have documentation that shows how users can use it to
4592
;; send their logs to logstash, so we include it in the jar.
46-
[net.logstash.logback/logstash-logback-encoder]
93+
[net.logstash.logback/logstash-logback-encoder "7.3"]
4794

4895
[org.openvoxproject/jruby-utils]
49-
[org.openvoxproject/clj-shell-utils]
96+
[org.openvoxproject/clj-shell-utils "2.1.0"]
5097
[org.openvoxproject/trapperkeeper]
5198
[org.openvoxproject/trapperkeeper-webserver-jetty10]
52-
[org.openvoxproject/trapperkeeper-authorization]
53-
[org.openvoxproject/trapperkeeper-comidi-metrics]
99+
[org.openvoxproject/trapperkeeper-authorization "2.1.0"]
100+
[org.openvoxproject/trapperkeeper-comidi-metrics "1.0.0"]
54101
[org.openvoxproject/trapperkeeper-metrics]
55-
[org.openvoxproject/trapperkeeper-scheduler]
56-
[org.openvoxproject/trapperkeeper-status]
57-
[org.openvoxproject/trapperkeeper-filesystem-watcher]
102+
[org.openvoxproject/trapperkeeper-scheduler "1.3.0"]
103+
[org.openvoxproject/trapperkeeper-status "1.3.0"]
104+
[org.openvoxproject/trapperkeeper-filesystem-watcher "1.3.0"]
58105
[org.openvoxproject/kitchensink]
59-
[org.openvoxproject/ssl-utils]
60-
[org.openvoxproject/ring-middleware]
61-
[org.openvoxproject/dujour-version-check]
62-
[org.openvoxproject/http-client]
63-
[org.openvoxproject/comidi]
64-
[org.openvoxproject/i18n]
106+
[org.openvoxproject/ssl-utils "3.6.1"]
107+
[org.openvoxproject/ring-middleware "2.1.0"]
108+
[org.openvoxproject/dujour-version-check "1.1.0"]
109+
[org.openvoxproject/http-client "2.2.0"]
110+
[org.openvoxproject/comidi "1.1.1"]
111+
[org.openvoxproject/i18n ~i18n-version]
65112
[org.openvoxproject/rbac-client]]
66113

67114
:main puppetlabs.trapperkeeper.main
@@ -79,11 +126,10 @@
79126
:password :env/CLOJARS_PASSWORD
80127
:sign-releases false}]]
81128

82-
:plugins [[lein-parent "0.3.9"]
83-
[jonase/eastwood "1.4.3" :exclusions [org.clojure/clojure]]
129+
:plugins [[jonase/eastwood "1.4.3" :exclusions [org.clojure/clojure]]
84130
;; We have to have this, and it needs to agree with clj-parent
85131
;; until/unless you can have managed plugin dependencies.
86-
[org.openvoxproject/i18n "1.0.2" :hooks false]]
132+
[org.openvoxproject/i18n ~i18n-version :hooks false]]
87133
:uberjar-name "puppet-server-release.jar"
88134
:lein-ezbake {:vars {:user "puppet"
89135
:group "puppet"
@@ -111,14 +157,14 @@
111157
:classifiers [["test" :testutils]]
112158

113159
:profiles {:defaults {:source-paths ["dev"]
114-
:dependencies [[org.clojure/tools.namespace]
160+
:dependencies [[org.clojure/tools.namespace "0.2.11"]
115161
[org.openvoxproject/trapperkeeper-webserver-jetty10 :classifier "test"]
116-
[org.openvoxproject/trapperkeeper nil :classifier "test" :scope "test"]
162+
[org.openvoxproject/trapperkeeper :classifier "test" :scope "test"]
117163
[org.openvoxproject/trapperkeeper-metrics :classifier "test" :scope "test"]
118-
[org.openvoxproject/kitchensink nil :classifier "test" :scope "test"]
119-
[ring-basic-authentication]
120-
[ring/ring-mock]
121-
[beckon]
164+
[org.openvoxproject/kitchensink :classifier "test" :scope "test"]
165+
[ring-basic-authentication "1.1.0"]
166+
[ring/ring-mock "0.4.0"]
167+
[beckon "0.1.1"]
122168
[lambdaisland/uri "1.19.155"]
123169
[org.openvoxproject/rbac-client :classifier "test" :scope "test"]]}
124170
:dev-deps {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}

0 commit comments

Comments
 (0)