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
|
From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome@riseup.net>
Date: Thu, 20 Oct 2022 20:20:26 -0400
Subject: Patch project.clj to build locally with lein.
Forwarded: not-needed
---
project.clj | 47 ++++++++++++++++++++++-------------------------
1 file changed, 22 insertions(+), 25 deletions(-)
Index: trapperkeeper-clojure/project.clj
===================================================================
--- trapperkeeper-clojure.orig/project.clj
+++ trapperkeeper-clojure/project.clj
@@ -6,45 +6,41 @@
:min-lein-version "2.9.0"
- :parent-project {:coords [puppetlabs/clj-parent "6.0.1"]
- :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.clojure/clojure]
- [org.clojure/tools.logging]
- [org.clojure/tools.macro]
- [org.clojure/core.async]
-
- [org.slf4j/slf4j-api]
- [org.slf4j/log4j-over-slf4j]
- [ch.qos.logback/logback-classic]
+ :dependencies [[org.clojure/clojure "1.x"]
+ [org.clojure/tools.logging "debian"]
+ [org.clojure/tools.macro "debian"]
+ [org.clojure/core.async "debian"]
+
+ [org.slf4j/slf4j-api "debian"]
+ [org.slf4j/log4j-over-slf4j "debian"]
+ [ch.qos.logback/logback-classic "debian"]
;; even though we don't strictly have a dependency on the following two
;; logback artifacts, specifying the dependency version here ensures
;; that downstream projects don't pick up different versions that would
;; conflict with our version of logback-classic
- [ch.qos.logback/logback-core]
- [ch.qos.logback/logback-access]
+ [ch.qos.logback/logback-core "debian"]
+ [ch.qos.logback/logback-access "debian"]
;; Janino can be used for some advanced logback configurations
- [org.codehaus.janino/janino]
+ [org.codehaus.janino/janino "debian"]
- [clj-time]
- [clj-commons/fs]
+ [clj-time "debian"]
+ [clj-commons/fs "debian"]
- [prismatic/plumbing]
- [prismatic/schema]
+ [prismatic/plumbing "debian"]
+ [prismatic/schema "debian"]
- [beckon]
+ [beckon "debian"]
- [puppetlabs/typesafe-config]
+ [puppetlabs/typesafe-config "debian"]
;; exclusion added due to dependency conflict over asm and jackson-dataformat-cbor
;; see https://github.com/puppetlabs/trapperkeeper/pull/306#issuecomment-1467059264
- [puppetlabs/kitchensink nil :exclusions [cheshire]]
- [puppetlabs/i18n]
- [nrepl/nrepl]
- [io.github.clj-kondo/config-slingshot-slingshot "1.0.0"]]
+ [puppetlabs/kitchensink "debian" :exclusions [cheshire]]
+ [puppetlabs/i18n "debian" :exclusions [org.clojure/clojure]]
+ [nrepl/nrepl "debian"]]
:deploy-repositories [["releases" {:url "https://clojars.org/repo"
:username :env/clojars_jenkins_username
@@ -63,15 +59,14 @@
:profiles {:dev {:source-paths ["examples/shutdown_app/src"
"examples/java_service/src/clj"]
:java-source-paths ["examples/java_service/src/java"]
- :dependencies [[puppetlabs/kitchensink nil :classifier "test" :exclusions [cheshire]]]}
+ :jar-exclusions [#".*/locales\.clj"]
+ :dependencies [[puppetlabs/kitchensink "debian" :classifier "test" :exclusions [cheshire]]]}
:testutils {:source-paths ^:replace ["test"]}
:uberjar {:aot [puppetlabs.trapperkeeper.main]
:classifiers ^:replace []}}
- :plugins [[lein-parent "0.3.7"]
- [jonase/eastwood "1.2.2" :exclusions [org.clojure/clojure]]
- [puppetlabs/i18n "0.9.2"]]
+ :plugins [[puppetlabs/i18n "debian" :exclusions [org.clojure/clojure]]]
:eastwood {:ignored-faults {:reflection {puppetlabs.trapperkeeper.logging [{:line 92}]
puppetlabs.trapperkeeper.internal [{:line 128}]
@@ -90,5 +85,6 @@
:continue-on-exception true}
- :main puppetlabs.trapperkeeper.main)
+ :main puppetlabs.trapperkeeper.main
+ :local-repo "debian/maven-repo")
|