1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome@riseup.net>
Date: Fri, 1 Jul 2022 10:41:31 -0400
Subject: Patch project.clj to build locally using lein
Forwarded: not-needed
---
project.clj | 144 +++++++++++++++++++++++++++++++-----------------------------
1 file changed, 74 insertions(+), 70 deletions(-)
Index: puppetdb/project.clj
===================================================================
--- puppetdb.orig/project.clj
+++ puppetdb/project.clj
@@ -44,19 +44,19 @@
(def pdb-dev-deps
(concat
- '[[ring/ring-mock]
- [puppetlabs/trapperkeeper :classifier "test"]
- [puppetlabs/kitchensink :classifier "test"]
- [com.puppetlabs/trapperkeeper-webserver-jetty10 :classifier "test"]
- [org.flatland/ordered "1.15.12"]
- [org.clojure/test.check "1.1.1"]
- [com.gfredericks/test.chuck "0.2.14"]
- [riddley "0.2.0"]
- [clj-commons/clj-yaml "1.0.27"]
- [org.yaml/snakeyaml]
+ '[[ring/ring-mock "debian"]
+ [puppetlabs/trapperkeeper "debian" :classifier "test"]
+ [puppetlabs/kitchensink "debian" :classifier "test"]
+ [com.puppetlabs/trapperkeeper-webserver-jetty10 "debian" :classifier "test"]
+ [org.flatland/ordered "debian"]
+ [org.clojure/test.check "debian"]
+ [com.gfredericks/test.chuck "debian"]
+ [riddley "debian"]
+ [clj-commons/clj-yaml "debian"]
+ [org.yaml/snakeyaml "1.x"]]))
;; Only needed for :integration tests
- [puppetlabs/trapperkeeper-filesystem-watcher nil]]))
+ ;; [puppetlabs/trapperkeeper-filesystem-watcher nil]]))
;; Don't use lein :clean-targets so that we don't have to repeat
;; ourselves, given that we need to remove some protected files, and
@@ -120,85 +120,88 @@
:min-lein-version "2.7.1"
- :parent-project {:coords [puppetlabs/clj-parent ~clj-parent-version]
- :inherit [:managed-dependencies]}
-
;; Abort when version ranges or version conflicts are detected in
;; dependencies. Also supports :warn to simply emit warnings.
;; requires lein 2.2.0+.
:pedantic? :abort
- :dependencies [[org.postgresql/postgresql]
- [org.clojure/clojure]
- [org.clojure/core.async]
- [org.clojure/core.match "0.3.0-alpha4"]
- [org.clojure/core.memoize]
- [org.clojure/data.generators "1.1.0"]
- [org.clojure/java.jdbc]
- [org.clojure/tools.macro]
- [org.clojure/tools.namespace]
- [org.clojure/math.combinatorics "0.1.1"]
- [org.clojure/tools.logging]
- [org.clojure/tools.nrepl]
+ :dependencies [[org.postgresql/postgresql "debian"]
+ [org.clojure/clojure "1.x"]
+ [org.clojure/core.async "debian"]
+ [org.clojure/core.match "debian"]
+ [org.clojure/core.memoize "debian"]
+ [org.clojure/data.generators "debian"]
+ [org.clojure/java.jdbc "debian"]
+ [org.clojure/tools.macro "debian"]
+ [org.clojure/tools.namespace "debian"]
+ [org.clojure/math.combinatorics "debian"]
+ [org.clojure/tools.logging "debian"]
+ [org.clojure/tools.nrepl "debian"]
;; Puppet specific
- [puppetlabs/comidi]
- [puppetlabs/dujour-version-check]
- [puppetlabs/i18n]
- [puppetlabs/kitchensink]
- [puppetlabs/ssl-utils]
- [puppetlabs/stockpile "0.0.4"]
- [puppetlabs/structured-logging]
- [puppetlabs/trapperkeeper]
- [com.puppetlabs/trapperkeeper-webserver-jetty10]
- [puppetlabs/trapperkeeper-metrics]
- [puppetlabs/trapperkeeper-status]
- [puppetlabs/trapperkeeper-authorization]
+ [puppetlabs/comidi "debian"]
+ [puppetlabs/dujour-version-check "debian"]
+ [puppetlabs/i18n "debian"]
+ [puppetlabs/kitchensink "debian"]
+ [puppetlabs/ssl-utils "debian"]
+ [puppetlabs/stockpile "debian"]
+ [puppetlabs/structured-logging "debian"]
+ [puppetlabs/trapperkeeper "debian"]
+ [com.puppetlabs/trapperkeeper-webserver-jetty10 "debian"]
+ [puppetlabs/trapperkeeper-metrics "debian" :exclusions [io.dropwizard.metrics/metrics-core]]
+ [puppetlabs/trapperkeeper-status "debian"]
+ [puppetlabs/trapperkeeper-authorization "debian"]
;; Various
- [cheshire]
- [clj-stacktrace]
- [clj-time]
- [com.rpl/specter "1.1.4"]
- [com.github.seancorfield/next.jdbc "1.3.939"]
- [com.taoensso/nippy :exclusions [org.tukaani/xz]]
- [digest "1.4.3"]
- [fast-zip "0.4.0"]
- [instaparse]
- [murphy "0.5.2"]
- [clj-commons/fs]
- [metrics-clojure]
- [robert/hooke "1.3.0"]
- [trptcolin/versioneer]
+ [cheshire "debian"]
+ [clj-stacktrace "debian"]
+ [clj-time "debian"]
+ [com.rpl/specter "debian"]
+ [com.github.seancorfield/next.jdbc "debian"]
+ [com.taoensso/nippy "debian" :exclusions [org.tukaani/xz]]
+ [digest "debian"]
+ [fast-zip "debian"]
+ [instaparse "debian"]
+ [murphy "debian"]
+ [clj-commons/fs "debian"]
+ [metrics-clojure "debian"]
+ [robert/hooke "debian"]
+ [trptcolin/versioneer "debian"]
;; We do not currently use this dependency directly, but
;; we have documentation that shows how users can use it to
;; send their logs to logstash, so we include it in the jar.
- [net.logstash.logback/logstash-logback-encoder]
- [com.fasterxml.jackson.core/jackson-databind]
+ [net.logstash.logback/logstash-logback-encoder "debian"]
+ [com.fasterxml.jackson.core/jackson-databind "2.x"]
;; Filesystem utilities
- [org.apache.commons/commons-lang3]
+ [org.apache.commons/commons-lang3 "debian"]
;; Database connectivity
- [com.zaxxer/HikariCP]
- [com.github.seancorfield/honeysql]
+ [com.zaxxer/HikariCP "debian"]
+ [com.github.seancorfield/honeysql "debian"]
;; WebAPI support libraries.
- [bidi]
- [clj-http "3.12.4"]
- [commons-io]
- [compojure]
- [ring/ring-core]]
+ [bidi "debian"]
+ [clj-http "debian"]
+ [commons-io "debian"]
+ [compojure "debian"]
+ [ring/ring-core "debian"]]
+
+ :managed-dependencies [[com.fasterxml.jackson.core/jackson-core "2.x"]
+ [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.x"]
+ [com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.x"]
+ [org.eclipse.jetty/jetty-jmx "9.x"]
+ [org.eclipse.jetty/jetty-proxy "9.x"]
+ [org.eclipse.jetty/jetty-server "9.x"]
+ [org.eclipse.jetty/jetty-servlet "9.x"]
+ [org.eclipse.jetty/jetty-servlets "9.x"]
+ [org.eclipse.jetty/jetty-webapp "9.x"]
+ [org.quartz-scheduler/quartz "2.x"]]
:jvm-opts ~pdb-jvm-opts
:repositories ~pdb-repositories
- :plugins [[lein-release "1.1.3" :exclusions [org.clojure/clojure]]
- [lein-cloverage "1.2.4"]
- [lein-parent "0.3.9"]
- [puppetlabs/i18n ~i18n-version]]
-
:lein-release {:scm :git
:deploy-via :lein-deploy}
@@ -234,8 +237,7 @@
:injections [(do
(require 'schema.core)
(schema.core/set-fn-validation! true))]}
- :dev [:defaults {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]
- :plugins [[jonase/eastwood "1.4.2"]]
+ :dev [:defaults {:dependencies [[org.bouncycastle/bcpkix "debian"]]
:jvm-opts ~(conj pdb-jvm-opts "-XX:-OmitStackTraceInFastThrow")}]
:fips [:defaults
@@ -333,4 +335,6 @@
"pdb-dataset" ^{:doc (clojure.string/join "" ["Restores an empty database from a pg_dump resulted backup"
" file and shifts all timestamps with the period between the most recent one in"
" the databse and the one you provide, or the current date."])}
- ["trampoline" "run" "-m" "puppetlabs.puppetdb.cli.pdb-dataset"]})
+ ["trampoline" "run" "-m" "puppetlabs.puppetdb.cli.pdb-dataset"]}
+
+ :local-repo "debian/maven-repo")
|
