Skip to content

Commit d53a647

Browse files
authored
Merge pull request #171 from OpenVoxProject/renovate/jackson-version
Update jackson-version to v2.21.0
2 parents 5d9f22c + 3a81c97 commit d53a647

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
["--illegal-access=deny"]))
100100

101101
(def i18n-version "1.0.3")
102-
(def jackson-version "2.20.1")
102+
(def jackson-version "2.21.0")
103103
(def slf4j-version "2.0.17")
104104
(defproject org.openvoxproject/puppetdb pdb-version
105105
:description "OpenVox-integrated catalog and fact storage"

test/puppetlabs/puppetdb/http/index_test.clj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,14 @@
9595

9696
;; Ensure we don't allow garbage after query
9797
(let [{:keys [status body headers]} (query-response method endpoint "[\"from\",\"foobar\"] random-stuff")]
98-
(is (= (str "Json parse error at line 1, column 25:\n\n"
99-
"[\"from\",\"foobar\"] random-stuff\n"
100-
" ^\n\n"
98+
(is (re-matches
99+
(re-pattern
100+
(str "(?s)^Json parse error at line 1, column \\d+:\\n\\n"
101+
"\\[\"from\",\"foobar\"\\] random-stuff\\n"
102+
"\\s+\\^\\n\\n"
101103
"Unrecognized token 'random': was expecting "
102-
"(JSON String, Number, Array, Object or token 'null', 'true' or 'false')") body))
104+
"\\(JSON String, Number, Array, Object or token 'null', 'true' or 'false'\\)$"))
105+
body))
103106
(are-error-response-headers headers)
104107
(is (= HttpURLConnection/HTTP_BAD_REQUEST status)))
105108

0 commit comments

Comments
 (0)