Skip to content

Commit a518110

Browse files
authored
Merge pull request #9 from OpenVoxProject/remove_clj_parent
Remove clj-parent
2 parents 7b0cc57 + 37c396c commit a518110

File tree

1 file changed

+45
-18
lines changed

1 file changed

+45
-18
lines changed

project.clj

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
(def jetty-10-version "10.0.26")
2+
(def logback-version "1.3.16")
3+
(def kitchensink-version "3.5.3")
4+
(def trapperkeeper-version "4.3.0")
5+
(def i18n-version "1.0.2")
6+
(def slf4j-version "2.0.17")
27

38
(defproject org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.1-SNAPSHOT"
49
:description "A jetty10-based webserver implementation for use with the org.openvoxproject/trapperkeeper service framework."
@@ -8,16 +13,39 @@
813

914
:min-lein-version "2.9.1"
1015

11-
:parent-project {:coords [org.openvoxproject/clj-parent "7.6.3"]
12-
:inherit [:managed-dependencies]}
13-
1416
;; Abort when version ranges or version conflicts are detected in
1517
;; dependencies. Also supports :warn to simply emit warnings.
1618
;; requires lein 2.2.0+.
1719
:pedantic? :abort
20+
21+
;; These are to enforce consistent versions across dependencies of dependencies,
22+
;; and to avoid having to define versions in multiple places. If a component
23+
;; defined under :dependencies ends up causing an error due to :pedantic? :abort,
24+
;; because it is a dep of a dep with a different version, move it here.
25+
:managed-dependencies [[org.clojure/clojure "1.12.4"]
26+
27+
[ring/ring-core "1.8.2"]
28+
[ring/ring-codec "1.1.2"]
29+
[commons-codec "1.15"]
30+
[commons-io "2.20.0"]
31+
32+
[org.slf4j/slf4j-api ~slf4j-version]
33+
[org.slf4j/jul-to-slf4j ~slf4j-version]
34+
[org.slf4j/log4j-over-slf4j ~slf4j-version]
35+
36+
[org.bouncycastle/bcpkix-jdk18on "1.83"]
37+
[org.bouncycastle/bcpkix-fips "1.0.8"]
38+
[org.bouncycastle/bc-fips "1.0.2.6"]
39+
[org.bouncycastle/bctls-fips "1.0.19"]
40+
41+
[org.openvoxproject/kitchensink ~kitchensink-version]
42+
[org.openvoxproject/kitchensink ~kitchensink-version :classifier "test"]
43+
[org.openvoxproject/trapperkeeper ~trapperkeeper-version]
44+
[org.openvoxproject/trapperkeeper ~trapperkeeper-version :classifier "test"]]
45+
1846
:dependencies [[org.clojure/clojure]
19-
[org.clojure/java.jmx]
20-
[org.clojure/tools.logging]
47+
[org.clojure/java.jmx "1.0.0"]
48+
[org.clojure/tools.logging "1.2.4"]
2149

2250
[org.flatland/ordered "1.5.9"]
2351

@@ -35,26 +63,25 @@
3563
[org.eclipse.jetty.websocket/websocket-jetty-api ~jetty-10-version]
3664

3765

38-
[prismatic/schema]
39-
[ring/ring-servlet]
66+
[prismatic/schema "1.1.12"]
67+
[ring/ring-servlet "1.8.2"]
4068
[ring/ring-codec]
41-
[ch.qos.logback/logback-access]
42-
[ch.qos.logback/logback-core]
43-
[ch.qos.logback/logback-classic]
69+
[ch.qos.logback/logback-access ~logback-version]
70+
[ch.qos.logback/logback-core ~logback-version]
71+
[ch.qos.logback/logback-classic ~logback-version]
4472

45-
[org.openvoxproject/ssl-utils]
73+
[org.openvoxproject/ssl-utils "3.6.1"]
4674
[org.openvoxproject/kitchensink]
4775
[org.openvoxproject/trapperkeeper]
48-
[org.openvoxproject/i18n]
49-
[org.openvoxproject/trapperkeeper-filesystem-watcher]
76+
[org.openvoxproject/i18n ~i18n-version]
77+
[org.openvoxproject/trapperkeeper-filesystem-watcher "1.3.0"]
5078

5179
[org.slf4j/jul-to-slf4j]]
5280

5381
:source-paths ["src"]
5482
:java-source-paths ["java"]
5583

56-
:plugins [[lein-parent "0.3.9"]
57-
[org.openvoxproject/i18n "1.0.2"]]
84+
:plugins [[org.openvoxproject/i18n ~i18n-version]]
5885

5986
:deploy-repositories [["releases" {:url "https://clojars.org/repo"
6087
:username :env/CLOJARS_USERNAME
@@ -77,11 +104,11 @@
77104
:java-source-paths ["examples/servlet_app/src/java"
78105
"test/java"]
79106
:resource-paths ["dev-resources"]
80-
:dependencies [[org.openvoxproject/http-client]
107+
:dependencies [[org.openvoxproject/http-client "2.2.0"]
81108
[org.openvoxproject/kitchensink nil :classifier "test"]
82109
[org.openvoxproject/trapperkeeper nil :classifier "test"]
83-
[org.clojure/tools.namespace]
84-
[compojure]
110+
[org.clojure/tools.namespace "0.2.11"]
111+
[compojure "1.7.1"]
85112
[ring/ring-core]
86113
[hato "0.9.0"]]}
87114
:dev-only {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]

0 commit comments

Comments
 (0)