Louis-Philippe Véronneau pushed to branch debian/main at Debian Clojure
Maintainers / puppetlabs-http-client-clojure
Commits:
210e82f8 by Louis-Philippe Véronneau at 2023-01-13T11:53:13-05:00
releasing package puppetlabs-http-client-clojure version 2.1.0-3
- - - - -
2 changed files:
- debian/changelog
- debian/patches/0001_Lein_Local.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+puppetlabs-http-client-clojure (2.1.0-3) unstable; urgency=medium
+
+ * Team upload.
+ * d/patches/0001: remove Java version restriction. (Closes: #1026687)
+
+ -- Louis-Philippe Véronneau <po...@debian.org> Fri, 13 Jan 2023 11:42:45
-0500
+
puppetlabs-http-client-clojure (2.1.0-2) unstable; urgency=medium
* Team upload.
=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -7,10 +7,10 @@ Forwarded: not-needed
project.clj | 59 +++++++++++++++++++++++++++++++----------------------------
1 file changed, 31 insertions(+), 28 deletions(-)
-diff --git a/project.clj b/project.clj
-index f78cb04..7644a51 100644
---- a/project.clj
-+++ b/project.clj
+Index: puppetlabs-http-client-clojure/project.clj
+===================================================================
+--- puppetlabs-http-client-clojure.orig/project.clj
++++ puppetlabs-http-client-clojure/project.clj
@@ -5,25 +5,22 @@
:min-lein-version "2.9.1"
@@ -23,25 +23,28 @@ index f78cb04..7644a51 100644
- ;; 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]
-+ [org.slf4j/jul-to-slf4j "debian"]
-
+-
- [puppetlabs/ssl-utils]
- [puppetlabs/i18n]
-
- [org.slf4j/jul-to-slf4j]]
++ [org.apache.httpcomponents/httpasyncclient "debian"]
++ [prismatic/schema "debian"]
++ [commons-io "debian"]
++ [io.dropwizard.metrics/metrics-core "debian"]
++
++ [puppetlabs/ssl-utils "debian"]
++ [puppetlabs/i18n "debian"]
++
++ [org.slf4j/jul-to-slf4j "debian"]
++
+ [org.yaml/snakeyaml "1.x"]
+ [com.fasterxml.jackson.core/jackson-core "2.x"]
+ [com.fasterxml.jackson.dataformat/jackson-dataformat-smile
"2.x"]
@@ -49,7 +52,7 @@ index f78cb04..7644a51 100644
:source-paths ["src/clj"]
:java-source-paths ["src/java"]
-@@ -34,18 +31,23 @@
+@@ -34,36 +31,27 @@
;; depend on this source jar using a :classifier in their :dependencies.
:classifiers [["sources" :sources-jar]]
@@ -82,7 +85,26 @@ index f78cb04..7644a51 100644
:fips [:defaults
{:dependencies [[org.bouncycastle/bcpkix-fips]
[org.bouncycastle/bc-fips]
-@@ -76,8 +78,9 @@
+- [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 +64,9 @@
:lein-release {:scm :git
:deploy-via :lein-deploy}
View it on GitLab:
https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/commit/210e82f8f4c260412489f6f83060f881cd3e96bc
--
View it on GitLab:
https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/commit/210e82f8f4c260412489f6f83060f881cd3e96bc
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
