Skip to content

Commit a037fa7

Browse files
nmburgannmburgan
authored
Merge pull request #158 from OpenVoxProject/fix_managed_deps
Move versions into managed deps and update openvox components
2 parents 0651e7d + afa52da commit a037fa7

File tree

1 file changed

+85
-69
lines changed

1 file changed

+85
-69
lines changed

‎project.clj‎

Lines changed: 85 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,9 @@
1616
default-heap-size))
1717

1818
(def slf4j-version "2.0.17")
19-
(def kitchensink-version "3.5.5")
20-
(def trapperkeeper-version "4.3.2")
21-
(def trapperkeeper-webserver-jetty10-version "1.1.2")
22-
(def trapperkeeper-metrics-version "2.1.3")
23-
(def rbac-client-version "1.2.2")
2419
(def i18n-version "1.0.3")
2520
(def logback-version "1.3.16")
26-
(def jackson-version "2.17.0")
21+
(def jackson-version "2.20.1")
2722

2823
(require '[clojure.string :as str]
2924
'[leiningen.core.main :as main])
@@ -47,84 +42,105 @@
4742

4843
:min-lein-version "2.9.1"
4944

50-
;; These are to enforce consistent versions across dependencies of dependencies,
51-
;; and to avoid having to define versions in multiple places. If a component
52-
;; defined under :dependencies ends up causing an error due to :pedantic? :abort,
53-
;; because it is a dep of a dep with a different version, move it here.
45+
;; Generally, try to keep version pins in :managed-dependencies and the libraries
46+
;; this project actually uses in :dependencies, inheriting the version from
47+
;; :managed-dependencies. This prevents endless version conflicts due to deps of deps.
48+
;; Renovate should keep the versions largely in sync between projects.
5449
:managed-dependencies [[org.clojure/clojure "1.12.4"]
55-
[org.slf4j/slf4j-api ~slf4j-version]
56-
[org.slf4j/jul-to-slf4j ~slf4j-version]
57-
[org.slf4j/log4j-over-slf4j ~slf4j-version]
58-
50+
[org.clojure/tools.namespace "0.2.11"]
51+
[beckon "0.1.1"]
52+
[ch.qos.logback/logback-access ~logback-version]
5953
[ch.qos.logback/logback-classic ~logback-version]
6054
[ch.qos.logback/logback-core ~logback-version]
61-
[ch.qos.logback/logback-access ~logback-version]
62-
55+
[clj-commons/fs "1.6.312"]
56+
[clj-time "0.15.2"]
6357
[com.fasterxml.jackson.core/jackson-core ~jackson-version]
6458
[com.fasterxml.jackson.core/jackson-databind ~jackson-version]
65-
[com.fasterxml.jackson.core/jackson-annotations ~jackson-version]
6659
[com.fasterxml.jackson.module/jackson-module-afterburner ~jackson-version]
67-
68-
[ring/ring-core "1.8.2"]
69-
[ring/ring-codec "1.1.2"]
60+
;; For some reason, this version is 2.20 without a .1. Update this back to
61+
;; ~jackson-version when they match again.
62+
[com.fasterxml.jackson.core/jackson-annotations "2.20"]
7063
[commons-codec "1.20.0"]
64+
[commons-io "2.21.0"]
65+
[grimradical/clj-semver "0.3.0" :exclusions [org.clojure/clojure]]
7166
[io.dropwizard.metrics/metrics-core "3.2.6"]
72-
[org.ow2.asm/asm "9.9.1"]
73-
67+
[lambdaisland/uri "1.19.155"]
68+
[liberator "0.15.3"]
69+
[net.logstash.logback/logstash-logback-encoder "7.3"]
70+
[org.apache.commons/commons-exec "1.6.0"]
7471
[org.bouncycastle/bcpkix-jdk18on "1.83"]
7572
[org.bouncycastle/bcpkix-fips "1.0.8"]
7673
[org.bouncycastle/bc-fips "1.0.2.6"]
7774
[org.bouncycastle/bctls-fips "1.0.19"]
78-
79-
[org.openvoxproject/kitchensink ~kitchensink-version]
80-
[org.openvoxproject/kitchensink ~kitchensink-version :classifier "test"]
81-
[org.openvoxproject/trapperkeeper ~trapperkeeper-version]
82-
[org.openvoxproject/trapperkeeper ~trapperkeeper-version :classifier "test"]
83-
[org.openvoxproject/trapperkeeper-webserver-jetty10 ~trapperkeeper-webserver-jetty10-version]
84-
[org.openvoxproject/trapperkeeper-webserver-jetty10 ~trapperkeeper-webserver-jetty10-version :classifier "test"]
85-
[org.openvoxproject/trapperkeeper-metrics ~trapperkeeper-metrics-version]
86-
[org.openvoxproject/trapperkeeper-metrics ~trapperkeeper-metrics-version :classifier "test"]
87-
[org.openvoxproject/jruby-utils "5.3.4"]
88-
[org.openvoxproject/rbac-client ~rbac-client-version]
89-
[org.openvoxproject/rbac-client ~rbac-client-version :classifier "test"]]
75+
[org.openvoxproject/clj-shell-utils "2.1.1"]
76+
[org.openvoxproject/comidi "1.1.2"]
77+
[org.openvoxproject/dujour-version-check "1.1.2"]
78+
[org.openvoxproject/http-client "2.2.3"]
79+
[org.openvoxproject/i18n ~i18n-version]
80+
[org.openvoxproject/jruby-utils "5.3.5"]
81+
[org.openvoxproject/kitchensink "3.5.5"]
82+
[org.openvoxproject/kitchensink "3.5.5" :classifier "test"]
83+
[org.openvoxproject/rbac-client "1.2.3"]
84+
[org.openvoxproject/rbac-client "1.2.3" :classifier "test"]
85+
[org.openvoxproject/ring-middleware "2.1.3"]
86+
[org.openvoxproject/ssl-utils "3.6.2"]
87+
[org.openvoxproject/trapperkeeper "4.3.2"]
88+
[org.openvoxproject/trapperkeeper "4.3.2" :classifier "test"]
89+
[org.openvoxproject/trapperkeeper-comidi-metrics "1.0.1"]
90+
[org.openvoxproject/trapperkeeper-authorization "2.1.5"]
91+
[org.openvoxproject/trapperkeeper-filesystem-watcher "1.5.1"]
92+
[org.openvoxproject/trapperkeeper-metrics "2.1.5"]
93+
[org.openvoxproject/trapperkeeper-metrics "2.1.5" :classifier "test"]
94+
[org.openvoxproject/trapperkeeper-scheduler "1.3.1"]
95+
[org.openvoxproject/trapperkeeper-status "1.3.1"]
96+
[org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.3"]
97+
[org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.3" :classifier "test"]
98+
[org.ow2.asm/asm "9.9.1"]
99+
[org.slf4j/jul-to-slf4j ~slf4j-version]
100+
[org.slf4j/log4j-over-slf4j ~slf4j-version]
101+
[org.slf4j/slf4j-api ~slf4j-version]
102+
[org.yaml/snakeyaml "2.0"]
103+
[pjstadig/humane-test-output "0.11.0"]
104+
[prismatic/schema "1.4.1"]
105+
[ring-basic-authentication "1.2.0"]
106+
[ring/ring-codec "1.1.2"]
107+
[ring/ring-core "1.8.2"]
108+
[ring/ring-mock "0.4.0"]
109+
[slingshot "0.12.2"]]
90110

91111
:dependencies [[org.clojure/clojure]
92-
93-
[slingshot "0.12.2"]
94-
[org.yaml/snakeyaml "2.0"]
95-
[commons-io "2.21.0"]
96-
97-
[clj-time "0.15.2"]
98-
[grimradical/clj-semver "0.3.0" :exclusions [org.clojure/clojure]]
99-
[prismatic/schema "1.4.1"]
100-
[clj-commons/fs "1.6.312"]
101-
[liberator "0.15.3"]
102-
[org.apache.commons/commons-exec "1.6.0"]
112+
[clj-commons/fs]
113+
[clj-time]
114+
[commons-io]
115+
[grimradical/clj-semver :exclusions [org.clojure/clojure]]
103116
[io.dropwizard.metrics/metrics-core]
104-
117+
[liberator]
105118
;; We do not currently use this dependency directly, but
106119
;; we have documentation that shows how users can use it to
107120
;; send their logs to logstash, so we include it in the jar.
108-
[net.logstash.logback/logstash-logback-encoder "7.3"]
109-
121+
[net.logstash.logback/logstash-logback-encoder]
122+
[org.apache.commons/commons-exec]
123+
[org.openvoxproject/clj-shell-utils]
124+
[org.openvoxproject/comidi]
125+
[org.openvoxproject/dujour-version-check]
126+
[org.openvoxproject/http-client]
110127
[org.openvoxproject/jruby-utils]
111-
[org.openvoxproject/clj-shell-utils "2.1.1"]
128+
[org.openvoxproject/i18n]
129+
[org.openvoxproject/kitchensink]
130+
[org.openvoxproject/rbac-client]
131+
[org.openvoxproject/ring-middleware]
132+
[org.openvoxproject/ssl-utils]
112133
[org.openvoxproject/trapperkeeper]
113-
[org.openvoxproject/trapperkeeper-webserver-jetty10]
114-
[org.openvoxproject/trapperkeeper-authorization "2.1.4"]
115-
[org.openvoxproject/trapperkeeper-comidi-metrics "1.0.0"]
134+
[org.openvoxproject/trapperkeeper-authorization]
135+
[org.openvoxproject/trapperkeeper-comidi-metrics]
136+
[org.openvoxproject/trapperkeeper-filesystem-watcher]
116137
[org.openvoxproject/trapperkeeper-metrics]
117-
[org.openvoxproject/trapperkeeper-scheduler "1.3.1"]
118-
[org.openvoxproject/trapperkeeper-status "1.3.0"]
119-
[org.openvoxproject/trapperkeeper-filesystem-watcher "1.5.1"]
120-
[org.openvoxproject/kitchensink]
121-
[org.openvoxproject/ssl-utils "3.6.2"]
122-
[org.openvoxproject/ring-middleware "2.1.2"]
123-
[org.openvoxproject/dujour-version-check "1.1.1"]
124-
[org.openvoxproject/http-client "2.2.2"]
125-
[org.openvoxproject/comidi "1.1.2"]
126-
[org.openvoxproject/i18n ~i18n-version]
127-
[org.openvoxproject/rbac-client]]
138+
[org.openvoxproject/trapperkeeper-scheduler]
139+
[org.openvoxproject/trapperkeeper-status]
140+
[org.openvoxproject/trapperkeeper-webserver-jetty10]
141+
[org.yaml/snakeyaml]
142+
[prismatic/schema]
143+
[slingshot]]
128144

129145
:main puppetlabs.trapperkeeper.main
130146

@@ -172,15 +188,15 @@
172188
:classifiers [["test" :testutils]]
173189

174190
:profiles {:defaults {:source-paths ["dev"]
175-
:dependencies [[org.clojure/tools.namespace "0.2.11"]
191+
:dependencies [[org.clojure/tools.namespace]
176192
[org.openvoxproject/trapperkeeper-webserver-jetty10 :classifier "test"]
177193
[org.openvoxproject/trapperkeeper :classifier "test" :scope "test"]
178194
[org.openvoxproject/trapperkeeper-metrics :classifier "test" :scope "test"]
179195
[org.openvoxproject/kitchensink :classifier "test" :scope "test"]
180-
[ring-basic-authentication "1.2.0"]
181-
[ring/ring-mock "0.4.0"]
182-
[beckon "0.1.1"]
183-
[lambdaisland/uri "1.19.155"]
196+
[ring-basic-authentication]
197+
[ring/ring-mock]
198+
[beckon]
199+
[lambdaisland/uri]
184200
[org.openvoxproject/rbac-client :classifier "test" :scope "test"]]}
185201
:dev-deps {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}
186202
:dev [:defaults :dev-deps]
@@ -209,7 +225,7 @@
209225
:jvm-opts ["-Dclojure.core.async.pool-size=50", "-Xms4g", "-Xmx4g"]
210226
;; Use humane test output so you can actually see what the problem is
211227
;; when a test fails.
212-
:dependencies [[pjstadig/humane-test-output "0.11.0"]]
228+
:dependencies [[pjstadig/humane-test-output]]
213229
:injections [(require 'pjstadig.humane-test-output)
214230
(pjstadig.humane-test-output/activate!)]}
215231

0 commit comments

Comments
 (0)