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
|
From: Debian Clojure Maintainers <team+clojure@tracker.debian.org>
Date: Fri, 8 Jul 2022 23:55:20 -0400
Subject: Patch project.clj to build locally using lein.
Forwarded: not-needed
---
project.clj | 63 +++++++++++++++++++------------------------------------------
1 file changed, 19 insertions(+), 44 deletions(-)
diff --git a/project.clj b/project.clj
index 669765d..5edba9b 100644
--- a/project.clj
+++ b/project.clj
@@ -5,25 +5,17 @@
:min-lein-version "2.9.1"
- :parent-project {:coords [puppetlabs/clj-parent "5.2.11"]
- :inherit [:managed-dependencies]}
+ :dependencies [[org.clojure/clojure "1.x"]
- ;; 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
+ [org.apache.httpcomponents/httpasyncclient "debian"]
+ [prismatic/schema "debian"]
+ [commons-io "debian"]
+ [io.dropwizard.metrics/metrics-core "debian"]
- :dependencies [[org.clojure/clojure]
+ [puppetlabs/ssl-utils "debian"]
+ [puppetlabs/i18n "debian"]
- [org.apache.httpcomponents/httpasyncclient]
- [prismatic/schema]
- [commons-io]
- [io.dropwizard.metrics/metrics-core]
-
- [puppetlabs/ssl-utils]
- [puppetlabs/i18n]
-
- [org.slf4j/jul-to-slf4j]]
+ [org.slf4j/jul-to-slf4j "debian"]]
:source-paths ["src/clj"]
:java-source-paths ["src/java"]
@@ -34,36 +26,21 @@
;; depend on this source jar using a :classifier in their :dependencies.
:classifiers [["sources" :sources-jar]]
- :profiles {:provided {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}
- :defaults {:dependencies [[cheshire]
- [puppetlabs/kitchensink :classifier "test"]
- [puppetlabs/trapperkeeper]
- [puppetlabs/trapperkeeper :classifier "test"]
- [puppetlabs/trapperkeeper-webserver-jetty9]
- [puppetlabs/trapperkeeper-webserver-jetty9 :classifier "test"]
- [puppetlabs/ring-middleware]]
+ :profiles {:defaults {:dependencies [[cheshire "debian"]
+ [puppetlabs/kitchensink "debian" :classifier "test"]
+ [puppetlabs/trapperkeeper "debian"]
+ [puppetlabs/trapperkeeper "debian" :classifier "test"]
+ [puppetlabs/trapperkeeper-webserver-jetty9 "debian"]
+ [puppetlabs/trapperkeeper-webserver-jetty9 "debian" :classifier "test"]
+ [puppetlabs/ring-middleware "debian"]]
:resource-paths ["dev-resources"]
:jvm-opts ["-Djava.util.logging.config.file=dev-resources/logging.properties"]}
:dev [:defaults
- {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}]
+ {:dependencies [[org.bouncycastle/bcpkix "debian"]]}]
:fips [:defaults
{:dependencies [[org.bouncycastle/bcpkix-fips]
[org.bouncycastle/bc-fips]
- [org.bouncycastle/bctls-fips]]
- ;; this only ensures that we run with the proper profiles
- ;; during testing. This JVM opt will be set in the puppet module
- ;; that sets up the JVM classpaths during installation.
- :jvm-opts ~(let [version (System/getProperty "java.version")
- [major minor _] (clojure.string/split version #"\.")
- unsupported-ex (ex-info "Unsupported major Java version. Expects 8 or 11."
- {:major major
- :minor minor})]
- (condp = (java.lang.Integer/parseInt major)
- 1 (if (= 8 (java.lang.Integer/parseInt minor))
- ["-Djava.security.properties==dev-resources/jdk8-fips-security"]
- (throw unsupported-ex))
- 11 ["-Djava.security.properties==dev-resources/jdk11-fips-security"]
- (throw unsupported-ex)))}]
+ [org.bouncycastle/bctls-fips]]}]
:sources-jar {:java-source-paths ^:replace []
:jar-exclusions ^:replace []
:source-paths ^:replace ["src/clj" "src/java"]}}
@@ -76,8 +53,6 @@
:lein-release {:scm :git
:deploy-via :lein-deploy}
- :plugins [[lein-parent "0.3.7"]
- [puppetlabs/i18n "0.8.0"]]
+ :plugins [[puppetlabs/i18n "debian" :exclusions [org.clojure/clojure]]]
- :repositories [["puppet-releases" "https://artifactory.delivery.puppetlabs.net/artifactory/clojure-releases__local/"]
- ["puppet-snapshots" "https://artifactory.delivery.puppetlabs.net/artifactory/clojure-snapshots__local/"]])
+ :local-repo "debian/maven-repo")
|