Louis-Philippe Véronneau pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-metrics-clojure
Commits: c5cdb37f by Louis-Philippe Véronneau at 2023-01-07T15:19:22-05:00 d/patches/0001: remove Java version restriction. (Closes: #1026647) - - - - - 3 changed files: - debian/changelog - debian/patches/0001_Lein_Local.patch - debian/patches/0002-Add-undeclared-dependency-on-clojure.set-in-tests.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +trapperkeeper-metrics-clojure (1.5.0-2) unstable; urgency=medium + + * Team upload. + * d/patches/0001: remove Java version restriction. (Closes: #1026647) + + -- Louis-Philippe Véronneau <[email protected]> Sat, 07 Jan 2023 10:01:21 -0500 + trapperkeeper-metrics-clojure (1.5.0-1) unstable; urgency=medium * Team upload. ===================================== debian/patches/0001_Lein_Local.patch ===================================== @@ -7,19 +7,21 @@ Forwarded: not-needed project.clj | 76 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 35 deletions(-) -diff --git a/project.clj b/project.clj -index b47f215..73e9d6c 100644 ---- a/project.clj -+++ b/project.clj +Index: trapperkeeper-metrics-clojure/project.clj +=================================================================== +--- trapperkeeper-metrics-clojure.orig/project.clj ++++ trapperkeeper-metrics-clojure/project.clj @@ -4,34 +4,38 @@ :min-lein-version "2.9.1" - :pedantic? :abort -- ++ :dependencies [[org.clojure/clojure "1.10.x"] + - :parent-project {:coords [puppetlabs/clj-parent "5.2.6"] - :inherit [:managed-dependencies]} -- ++ [prismatic/schema "debian"] + - :dependencies [[org.clojure/clojure] - - [prismatic/schema] @@ -43,10 +45,6 @@ index b47f215..73e9d6c 100644 - - :plugins [[puppetlabs/i18n "0.6.0"] - [lein-parent "0.3.7"]] -+ :dependencies [[org.clojure/clojure "1.10.x"] -+ -+ [prismatic/schema "debian"] -+ + [puppetlabs/kitchensink "debian"] + [puppetlabs/trapperkeeper "debian"] + [puppetlabs/trapperkeeper-authorization "debian"] @@ -78,7 +76,7 @@ index b47f215..73e9d6c 100644 :source-paths ["src/clj"] :java-source-paths ["src/java"] -@@ -43,14 +47,14 @@ +@@ -43,34 +47,23 @@ :classifiers [["test" :testutils]] @@ -98,7 +96,20 @@ index b47f215..73e9d6c 100644 :fips [:defaults {:dependencies [[org.bouncycastle/bcpkix-fips] -@@ -70,7 +74,7 @@ + [org.bouncycastle/bc-fips] +- [org.bouncycastle/bctls-fips]] +- :jvm-opts ~(let [version (System/getProperty "java.specification.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/java.security.jdk8-fips"] +- (throw unsupported-ex)) +- 11 ["-Djava.security.properties==./dev-resources/java.security.jdk11-fips"] +- (throw unsupported-ex)))}] ++ [org.bouncycastle/bctls-fips]]}] ;; per https://github.com/technomancy/leiningen/issues/1907 ;; the provided profile is necessary for lein jar / lein install @@ -107,7 +118,7 @@ index b47f215..73e9d6c 100644 :resource-paths ["dev-resources"]} :testutils {:source-paths ^:replace ["test"] -@@ -78,4 +82,6 @@ +@@ -78,4 +71,6 @@ :repl-options {:init-ns examples.ring-app.repl} ===================================== debian/patches/0002-Add-undeclared-dependency-on-clojure.set-in-tests.patch ===================================== @@ -7,10 +7,10 @@ Forwarded: https://github.com/puppetlabs/trapperkeeper-metrics/pull/77 test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj b/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj -index ca94b60..2162ffb 100644 ---- a/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj -+++ b/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj +Index: trapperkeeper-metrics-clojure/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj +=================================================================== +--- trapperkeeper-metrics-clojure.orig/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj ++++ trapperkeeper-metrics-clojure/test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj @@ -1,6 +1,7 @@ (ns puppetlabs.trapperkeeper.services.metrics.metrics-testutils (:import (com.codahale.metrics.graphite GraphiteSender)) View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-metrics-clojure/-/commit/c5cdb37f1844117c009bb8e3cfe44bd7ca3f0c4a -- View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-metrics-clojure/-/commit/c5cdb37f1844117c009bb8e3cfe44bd7ca3f0c4a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
