Merge pull request #28 from OpenVoxProject/move_dep_pins

Move version pins

Author: nmburgan

project.clj

@@ -1,6 +1,3 @@
-(def kitchensink-version "3.5.5")
-(def trapperkeeper-version "4.3.2")
-(def trapperkeeper-webserver-jetty10-version "1.1.2")
 (def i18n-version "1.0.3")
 (def jackson-version "2.20.1")
 
@@ -10,53 +7,58 @@
             :url "http://www.apache.org/licenses/LICENSE-2.0.html"}
 
 
-  ;; These are to enforce consistent versions across dependencies of dependencies,
-  ;; and to avoid having to define versions in multiple places. If a component
-  ;; defined under :dependencies ends up causing an error due to :pedantic? :abort,
-  ;; because it is a dep of a dep with a different version, move it here.
+  ;; Generally, try to keep version pins in :managed-dependencies and the libraries
+  ;; this project actually uses in :dependencies, inheriting the version from
+  ;; :managed-dependencies. This prevents endless version conflicts due to deps of deps.
+  ;; Renovate should keep the versions largely in sync between projects.
   :managed-dependencies [[org.clojure/clojure "1.12.4"]
+                         [org.clojure/tools.nrepl "0.2.13"]
 
-                         [ring/ring-core "1.15.3"]
-                         [ring/ring-codec "1.3.0"]
-                         [commons-io "2.21.0"]
-                         [commons-codec "1.20.0"]
                          [cheshire "5.13.0"]
-
                          [com.fasterxml.jackson.core/jackson-core ~jackson-version]
                          [com.fasterxml.jackson.core/jackson-databind ~jackson-version]
-                         [com.fasterxml.jackson.module/jackson-module-afterburner ~jackson-version]
                          [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor ~jackson-version]
                          [com.fasterxml.jackson.dataformat/jackson-dataformat-smile ~jackson-version]
+                         [com.fasterxml.jackson.module/jackson-module-afterburner ~jackson-version]
                          ;; For some reason, this one doesn't follow the same versioning convention
                          ;; for 2.20 as the others. Set this back to ~jackson-version if it does
                          ;; for the next release.
                          [com.fasterxml.jackson.core/jackson-annotations "2.20"]
-                         
-                         [org.openvoxproject/kitchensink ~kitchensink-version]
-                         [org.openvoxproject/kitchensink ~kitchensink-version :classifier "test"]
-                         [org.openvoxproject/trapperkeeper ~trapperkeeper-version]
-                         [org.openvoxproject/trapperkeeper ~trapperkeeper-version :classifier "test"]
-                         [org.openvoxproject/trapperkeeper-webserver-jetty10 ~trapperkeeper-webserver-jetty10-version]
-                         [org.openvoxproject/trapperkeeper-webserver-jetty10 ~trapperkeeper-webserver-jetty10-version :classifier "test"]]
+                         [commons-codec "1.20.0"]
+                         [commons-io "2.21.0"]
+                         [org.openvoxproject/ring-middleware "2.1.2"]
+                         [org.openvoxproject/http-client "2.2.2"]
+                         [org.openvoxproject/i18n ~i18n-version]
+                         [org.bouncycastle/bcpkix-jdk18on "1.83"]
+                         [org.openvoxproject/kitchensink "3.5.5"]
+                         [org.openvoxproject/kitchensink "3.5.5" :classifier "test"]
+                         [org.openvoxproject/trapperkeeper "4.3.2"]
+                         [org.openvoxproject/trapperkeeper "4.3.2" :classifier "test"]
+                         [org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.2"]
+                         [org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.2" :classifier "test"]
+                         [ring/ring-core "1.15.3"]
+                         [ring/ring-codec "1.3.0"]
+                         [ring/ring-json "0.5.1"]
+                         [slingshot "0.12.2"]]
 
   :dependencies [[org.clojure/clojure]
-                 [ring/ring-core]
-                 [ring/ring-json "0.5.1"]
-                 [slingshot "0.12.2"]
-                 [org.openvoxproject/ring-middleware "2.1.2"]
+                 [org.openvoxproject/http-client]
+                 [org.openvoxproject/i18n]
                  [org.openvoxproject/kitchensink]
-                 [org.openvoxproject/http-client "2.2.2"]
+                 [org.openvoxproject/ring-middleware]
                  [org.openvoxproject/trapperkeeper]
-                 [org.openvoxproject/i18n ~i18n-version]]
+                 [ring/ring-core]
+                 [ring/ring-json]
+                 [slingshot]]
 
   :pedantic? :abort
-  :profiles {:dev {:dependencies [[org.openvoxproject/kitchensink :classifier "test"]
+  :profiles {:dev {:dependencies [[org.bouncycastle/bcpkix-jdk18on]
+                                  [org.openvoxproject/kitchensink :classifier "test"]
                                   [org.openvoxproject/trapperkeeper :classifier "test"]
                                   [org.openvoxproject/trapperkeeper-webserver-jetty10]
                                   [org.openvoxproject/trapperkeeper-webserver-jetty10 :classifier "test"]
-                                  [org.bouncycastle/bcpkix-jdk18on "1.83"]
                                   ; transitive dependency
-                                  [org.clojure/tools.nrepl "0.2.13"]]}
+                                  [org.clojure/tools.nrepl]]}
              :testutils {:source-paths ^:replace  ["test"]}}
 
   :plugins [[org.openvoxproject/i18n ~i18n-version]]