Skip to content

Commit b28d905

Browse files
nmburgannmburgan
authored
Merge pull request #151 from OpenVoxProject/update_deps
Move versions into managed deps and update openvox components
2 parents 5f587ea + 41fbece commit b28d905

File tree

3 files changed

+134
-97
lines changed

3 files changed

+134
-97
lines changed

‎project.clj‎

Lines changed: 126 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@
2525

2626
(def pdb-dev-deps
2727
(concat
28-
'[[ring/ring-mock "0.4.0"]
29-
[timofreiberg/bultitude "0.3.1"]
28+
'[[ring/ring-mock]
29+
[timofreiberg/bultitude]
3030
[org.openvoxproject/trapperkeeper :classifier "test"]
3131
[org.openvoxproject/kitchensink :classifier "test"]
3232
[org.openvoxproject/trapperkeeper-webserver-jetty10 :classifier "test"]
33-
[org.flatland/ordered "1.15.12"]
34-
[org.clojure/test.check "1.1.1"]
35-
[com.gfredericks/test.chuck "0.2.14"]
36-
[riddley "0.2.0"]
37-
[clj-commons/clj-yaml "1.0.27"]
33+
[org.flatland/ordered]
34+
[org.clojure/test.check]
35+
[com.gfredericks/test.chuck]
36+
[riddley]
37+
[clj-commons/clj-yaml]
3838
[org.yaml/snakeyaml]
3939

4040
;; Only needed for :integration tests
41-
[org.openvoxproject/trapperkeeper-filesystem-watcher "1.3.0"]]))
41+
[org.openvoxproject/trapperkeeper-filesystem-watcher]]))
4242

4343
;; Don't use lein :clean-targets so that we don't have to repeat
4444
;; ourselves, given that we need to remove some protected files, and
@@ -98,11 +98,8 @@
9898
(def pdb-jvm-opts (when (< 8 (:feature pdb-jvm-ver) 17)
9999
["--illegal-access=deny"]))
100100

101-
(def kitchensink-version "3.5.3")
102-
(def trapperkeeper-version "4.3.0")
103-
(def trapperkeeper-webserver-jetty10-version "1.1.0")
104-
(def jackson-version "2.15.4")
105101
(def i18n-version "1.0.2")
102+
(def jackson-version "2.20.1")
106103
(def slf4j-version "2.0.17")
107104
(defproject org.openvoxproject/puppetdb pdb-version
108105
:description "OpenVox-integrated catalog and fact storage"
@@ -124,100 +121,138 @@
124121
;; defined under :dependencies ends up causing an error due to :pedantic? :abort,
125122
;; because it is a dep of a dep with a different version, move it here.
126123
:managed-dependencies [[org.clojure/clojure "1.12.4"]
124+
[org.clojure/core.async "1.5.648"]
125+
[org.clojure/core.match "1.1.1"]
126+
[org.clojure/core.memoize "1.0.257"]
127+
[org.clojure/data.generators "1.1.1"]
128+
[org.clojure/java.jdbc "0.7.12"]
129+
[org.clojure/math.combinatorics "0.3.0"]
130+
[org.clojure/test.check "1.1.1"]
131+
[org.clojure/tools.logging "1.2.4"]
132+
[org.clojure/tools.macro "0.2.2"]
133+
[org.clojure/tools.namespace "0.2.11"]
134+
[org.clojure/tools.nrepl "0.2.13"]
127135
[org.clojure/tools.reader "1.3.6"]
128-
129-
[org.slf4j/slf4j-api ~slf4j-version]
130-
[org.slf4j/jul-to-slf4j ~slf4j-version]
131-
[org.slf4j/log4j-over-slf4j ~slf4j-version]
132-
133-
[org.openvoxproject/kitchensink ~kitchensink-version]
134-
[org.openvoxproject/kitchensink ~kitchensink-version :classifier "test"]
135-
[org.openvoxproject/trapperkeeper ~trapperkeeper-version]
136-
[org.openvoxproject/trapperkeeper ~trapperkeeper-version :classifier "test"]
137-
[org.openvoxproject/trapperkeeper-webserver-jetty10 ~trapperkeeper-webserver-jetty10-version]
138-
[org.openvoxproject/trapperkeeper-webserver-jetty10 ~trapperkeeper-webserver-jetty10-version :classifier "test"]
139-
136+
[bidi "2.1.6"]
137+
[cheshire "5.10.2"]
138+
[clj-commons/clj-yaml "1.0.27"]
139+
[clj-commons/fs "1.6.312"]
140+
[clj-http "3.13.1"]
141+
[clj-kondo "2025.10.23"]
142+
[clj-stacktrace "0.2.8"]
143+
[clj-time "0.11.0"]
140144
[com.fasterxml.jackson.core/jackson-core ~jackson-version]
141145
[com.fasterxml.jackson.core/jackson-databind ~jackson-version]
142-
[com.fasterxml.jackson.core/jackson-annotations ~jackson-version]
143-
[com.fasterxml.jackson.module/jackson-module-afterburner ~jackson-version]
144146
[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor ~jackson-version]
145147
[com.fasterxml.jackson.dataformat/jackson-dataformat-smile ~jackson-version]
146-
148+
[com.fasterxml.jackson.module/jackson-module-afterburner ~jackson-version]
149+
;; For some reason, this version is 2.20 without a .1. Update this back to
150+
;; ~jackson-version when they match again.
151+
[com.fasterxml.jackson.core/jackson-annotations "2.20"]
152+
[com.gfredericks/test.chuck "0.2.14"]
153+
[com.github.seancorfield/honeysql "2.3.911"]
154+
[com.github.seancorfield/next.jdbc "1.3.1086"]
155+
[com.rpl/specter "1.1.6"]
156+
[com.taoensso/nippy "3.1.1" :exclusions [org.tukaani/xz]]
157+
[com.zaxxer/HikariCP "5.0.1"]
158+
[commons-codec "1.20.0"]
159+
[commons-io "2.21.0"]
160+
[compojure "1.7.1"]
161+
[digest "1.4.10"]
162+
[fast-zip "0.4.0"]
163+
[instaparse "1.5.0"]
164+
[joda-time "2.12.5"]
165+
[metrics-clojure "2.10.0"]
166+
[murphy "0.5.3"]
167+
[net.logstash.logback/logstash-logback-encoder "7.3"]
168+
[org.apache.commons/commons-lang3 "3.20.0"]
147169
[org.bouncycastle/bcpkix-jdk18on "1.83"]
148170
[org.bouncycastle/bcpkix-fips "1.0.8"]
149171
[org.bouncycastle/bc-fips "1.0.2.6"]
150172
[org.bouncycastle/bctls-fips "1.0.19"]
151-
152-
[ring/ring-core "1.8.2"]
153-
[ring/ring-codec "1.3.0"]
154-
[instaparse "1.5.0"]
155-
[commons-codec "1.20.0"]
156-
[clj-time "0.11.0"]
173+
[org.flatland/ordered "1.15.12"]
174+
[org.slf4j/slf4j-api ~slf4j-version]
175+
[org.slf4j/jul-to-slf4j ~slf4j-version]
176+
[org.slf4j/log4j-over-slf4j ~slf4j-version]
177+
[org.openvoxproject/comidi "1.1.2"]
178+
[org.openvoxproject/i18n ~i18n-version]
179+
[org.openvoxproject/kitchensink "3.5.5"]
180+
[org.openvoxproject/kitchensink "3.5.5" :classifier "test"]
181+
[org.openvoxproject/ssl-utils "3.6.2"]
182+
[org.openvoxproject/stockpile "1.0.1"]
183+
[org.openvoxproject/structured-logging "1.0.1"]
184+
[org.openvoxproject/trapperkeeper "4.3.2"]
185+
[org.openvoxproject/trapperkeeper "4.3.2" :classifier "test"]
186+
[org.openvoxproject/trapperkeeper-authorization "2.1.5"]
187+
[org.openvoxproject/trapperkeeper-authorization "2.1.5" :exclusions [io.dropwizard.metrics/metrics-core]]
188+
[org.openvoxproject/trapperkeeper-filesystem-watcher "1.5.1"]
189+
[org.openvoxproject/trapperkeeper-metrics "2.1.6"]
190+
[org.openvoxproject/trapperkeeper-metrics "2.1.6" :exclusions [io.dropwizard.metrics/metrics-core]]
191+
[org.openvoxproject/trapperkeeper-status "1.3.1"]
192+
[org.openvoxproject/trapperkeeper-status "1.3.1" :exclusions [io.dropwizard.metrics/metrics-core]]
193+
[org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.3"]
194+
[org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.3" :classifier "test"]
195+
[org.postgresql/postgresql "42.7.8"]
157196
[org.yaml/snakeyaml "2.0"]
158-
[joda-time "2.12.5"]
159-
[cheshire "5.10.2"]]
160-
161-
:dependencies [[org.postgresql/postgresql "42.7.8"]
162-
[org.clojure/clojure]
163-
[org.clojure/core.async "1.5.648"]
164-
[org.clojure/core.match "1.1.1"]
165-
[org.clojure/core.memoize "1.0.257"]
166-
[org.clojure/data.generators "1.1.1"]
167-
[org.clojure/java.jdbc "0.7.12"]
168-
[org.clojure/tools.macro "0.2.2"]
169-
[org.clojure/tools.namespace "0.2.11"]
170-
[org.clojure/math.combinatorics "0.3.0"]
171-
[org.clojure/tools.logging "1.2.4"]
172-
[org.clojure/tools.nrepl "0.2.13"]
173-
174-
;; OpenVox specific
175-
[org.openvoxproject/comidi "1.1.1"]
176-
[org.openvoxproject/i18n ~i18n-version]
177-
[org.openvoxproject/kitchensink]
178-
[org.openvoxproject/ssl-utils "3.6.1"]
179-
[org.openvoxproject/stockpile "1.0.0"]
180-
[org.openvoxproject/structured-logging "1.0.0"]
181-
[org.openvoxproject/trapperkeeper]
182-
[org.openvoxproject/trapperkeeper-webserver-jetty10]
183-
[org.openvoxproject/trapperkeeper-metrics "2.1.0"]
184-
[org.openvoxproject/trapperkeeper-status "1.3.0"]
185-
[org.openvoxproject/trapperkeeper-authorization "2.1.0"]
186-
187-
;; Various
197+
[prismatic/schema "1.4.1"]
198+
[riddley "0.2.0"]
199+
[ring/ring-codec "1.3.0"]
200+
[ring/ring-core "1.8.2"]
201+
[ring/ring-mock "0.4.0"]
202+
[robert/hooke "1.3.0"]
203+
[timofreiberg/bultitude "0.3.1"]
204+
[trptcolin/versioneer "0.2.0"]]
205+
206+
:dependencies [[org.clojure/clojure]
207+
[org.clojure/core.async]
208+
[org.clojure/core.match]
209+
[org.clojure/core.memoize]
210+
[org.clojure/data.generators]
211+
[org.clojure/java.jdbc]
212+
[org.clojure/math.combinatorics]
213+
[org.clojure/tools.logging]
214+
[org.clojure/tools.macro]
215+
[org.clojure/tools.namespace]
216+
[org.clojure/tools.nrepl]
217+
[bidi]
188218
[cheshire]
189-
[clj-stacktrace "0.2.8"]
219+
[clj-commons/fs]
220+
[clj-http]
221+
[clj-stacktrace]
190222
[clj-time]
191-
[com.rpl/specter "1.1.6"]
192-
[com.github.seancorfield/next.jdbc "1.3.1086"]
193-
[com.taoensso/nippy "3.1.1" :exclusions [org.tukaani/xz]]
194-
[digest "1.4.10"]
195-
[fast-zip "0.4.0"]
223+
[com.fasterxml.jackson.core/jackson-databind]
224+
[com.github.seancorfield/honeysql]
225+
[com.github.seancorfield/next.jdbc]
226+
[com.rpl/specter]
227+
[com.taoensso/nippy :exclusions [org.tukaani/xz]]
228+
[com.zaxxer/HikariCP]
229+
[commons-io]
230+
[compojure]
231+
[digest]
232+
[fast-zip]
196233
[instaparse]
197-
[murphy "0.5.3"]
198-
[clj-commons/fs "1.6.312"]
199-
[metrics-clojure "2.10.0"]
200-
[robert/hooke "1.3.0"]
201-
[trptcolin/versioneer "0.2.0"]
234+
[metrics-clojure]
235+
[murphy]
202236
;; We do not currently use this dependency directly, but
203237
;; we have documentation that shows how users can use it to
204238
;; send their logs to logstash, so we include it in the jar.
205-
[net.logstash.logback/logstash-logback-encoder "7.3"]
206-
[com.fasterxml.jackson.core/jackson-databind]
207-
208-
;; Filesystem utilities
209-
[org.apache.commons/commons-lang3 "3.20.0"]
210-
211-
;; Database connectivity
212-
[com.zaxxer/HikariCP "5.0.1"]
213-
[com.github.seancorfield/honeysql "2.3.911"]
214-
215-
;; WebAPI support libraries.
216-
[bidi "2.1.6"]
217-
[clj-http "3.13.1"]
218-
[commons-io "2.21.0"]
219-
[compojure "1.7.1"]
220-
[ring/ring-core]]
239+
[net.logstash.logback/logstash-logback-encoder]
240+
[org.apache.commons/commons-lang3]
241+
[org.openvoxproject/comidi]
242+
[org.openvoxproject/i18n]
243+
[org.openvoxproject/kitchensink]
244+
[org.openvoxproject/ssl-utils]
245+
[org.openvoxproject/stockpile]
246+
[org.openvoxproject/structured-logging]
247+
[org.openvoxproject/trapperkeeper]
248+
[org.openvoxproject/trapperkeeper-authorization]
249+
[org.openvoxproject/trapperkeeper-metrics]
250+
[org.openvoxproject/trapperkeeper-status]
251+
[org.openvoxproject/trapperkeeper-webserver-jetty10]
252+
[org.postgresql/postgresql]
253+
[ring/ring-core]
254+
[robert/hooke]
255+
[trptcolin/versioneer]]
221256

222257
:jvm-opts ~pdb-jvm-opts
223258

@@ -294,7 +329,7 @@
294329

295330
:fips [:defaults :fips-settings]
296331

297-
:kondo {:dependencies [[clj-kondo "2025.10.23"]]}
332+
:kondo {:dependencies [[clj-kondo]]}
298333
:ezbake {:dependencies ^:replace [;; NOTE: we need to explicitly pass in `nil` values
299334
;; for the version numbers here in order to correctly
300335
;; inherit the versions from our parent project.

‎src/puppetlabs/puppetdb/pql.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"Takes an augmented failure object and prints the error message"
4141
[{:keys [line column text reason]}]
4242
(let [opening (tru "PQL parse error at line {0}, column {1}:\n\n{2}\n{3}\n\n"
43-
line column text (failure/marker column))
43+
line column text (failure/marker text column))
4444
full-reasons (distinct (map :expecting
4545
(filter :full reason)))
4646
partial-reasons (distinct (map :expecting

‎test/puppetlabs/puppetdb/http/index_test.clj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,13 @@
7676

7777
;; Ensure we parse anything that looks like AST/JSON as JSON not PQL
7878
(let [{:keys [status body headers]} (query-response method endpoint "[\"from\",\"foobar\"")]
79-
(is (= (str "Json parse error at line 1, column 17:\n\n"
80-
"[\"from\",\"foobar\"\n"
81-
" ^\n\n"
82-
"Unexpected end-of-input: expected close marker for Array "
83-
"(start marker at [Source: (StringReader); line: 1, column: 1])") body))
79+
(is (re-matches
80+
#"(?s)Json parse error at line 1, column 17:\n\n
81+
\[\"from\",\"foobar\"\n
82+
\s+\^\n\n
83+
Unexpected end-of-input: expected close marker for Array
84+
\(start marker at \[Source: .*; line: 1, column: 1\]\)"
85+
body))
8486
(are-error-response-headers headers)
8587
(is (= HttpURLConnection/HTTP_BAD_REQUEST status)))
8688

0 commit comments

Comments
 (0)