[Git][clojure-team/puppetlabs-http-client-clojure][debian/main] 9 commits: drop obsolete .gitignore file
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Wed Sep 9 02:02:26 BST 2026
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / puppetlabs-http-client-clojure
Commits:
fb7dbb3e by Jérôme Charaoui at 2026-08-31T22:51:38-04:00
drop obsolete .gitignore file
Gbp-Dch: ignore
- - - - -
0f667f24 by Jérôme Charaoui at 2026-09-08T18:11:53-04:00
switch packaging to dh-clojure
- - - - -
cf4827ae by Jérôme Charaoui at 2026-09-08T18:11:55-04:00
d/upstream: update metadata
- - - - -
5225a243 by Jérôme Charaoui at 2026-09-08T18:11:55-04:00
Remove redundant Priority: optional from source stanza.
Changes-By: lintian-brush
Fixes: lintian: source: redundant-priority-optional-field
See-also: https://lintian.debian.org/tags/redundant-priority-optional-field.html
- - - - -
7a0b37ca by Jérôme Charaoui at 2026-09-08T18:11:56-04:00
Update standards version to 4.7.4, no changes needed.
Upgrade checklist verified:
4.6.2 → 4.7.0:
* Package does not use dpkg-divert
4.7.0 → 4.7.1:
* Package does not install to non-/usr paths
4.7.3 → 4.7.4:
* Package is not in non-free-firmware
Changes-By: lintian-brush
Fixes: lintian: source: ancient-standards-version 4.6.2 (released 2022-12-17) (current is 4.7.4.1)
See-also: https://lintian.debian.org/tags/ancient-standards-version.html
- - - - -
922036fd by Jérôme Charaoui at 2026-09-08T18:11:56-04:00
Update watch file format version to 5.
Changes-By: lintian-brush
Fixes: lintian: source: older-debian-watch-file-standard 4
See-also: https://lintian.debian.org/tags/older-debian-watch-file-standard.html
- - - - -
f73603e2 by Jérôme Charaoui at 2026-09-08T18:11:57-04:00
Removed Rules-Requires-Root
Changes-By: lintian-brush
Fixes: lintian: source: redundant-rules-requires-root-no-field [debian/control]
See-also: https://lintian.debian.org/tags/redundant-rules-requires-root-no-field.html
- - - - -
9098449a by Jérôme Charaoui at 2026-09-08T20:15:57-04:00
switch to slf4j 2.x
- - - - -
555dbf29 by Jérôme Charaoui at 2026-09-08T20:16:34-04:00
Update changelog for 2.3.1-2 release
- - - - -
11 changed files:
- − debian/.gitignore
- debian/changelog
- debian/control
- + debian/dh-clojure-lein.clj
- − debian/libpuppetlabs-http-client-clojure.classpath
- − debian/libpuppetlabs-http-client-clojure.poms
- − debian/patches/0001_Lein_Local.patch
- debian/patches/series
- debian/rules
- debian/upstream/metadata
- debian/watch
Changes:
=====================================
debian/.gitignore deleted
=====================================
@@ -1 +0,0 @@
-!pom.xml
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+puppetlabs-http-client-clojure (2.3.1-2) unstable; urgency=medium
+
+ * switch packaging to dh-clojure
+ * switch to slf4j 2.x
+ * d/upstream: update metadata
+ * Remove redundant Priority: optional from source stanza.
+ * Update standards version to 4.7.4, no changes needed.
+ * Update watch file format version to 5.
+ * Removed Rules-Requires-Root
+
+ -- Jérôme Charaoui <jerome at riseup.net> Mon, 31 Aug 2026 22:55:59 -0400
+
puppetlabs-http-client-clojure (2.3.1-1) experimental; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
Source: puppetlabs-http-client-clojure
Section: java
-Priority: optional
Maintainer: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
Uploaders:
Apollon Oikonomopoulos <apoikos at debian.org>,
@@ -8,11 +7,9 @@ Uploaders:
Build-Depends:
debhelper-compat (= 13),
default-jdk-headless,
- javahelper,
- leiningen,
+ dh-clojure (>= 0.5.0),
libbcpkix-java <!nocheck>,
libcheshire-clojure <!nocheck>,
- libclojure-java,
libcommons-io-java,
libdropwizard-metrics-java,
libhttpasyncclient-java,
@@ -23,34 +20,21 @@ Build-Depends:
libpuppetlabs-i18n-clojure (>= 1.0.4),
libpuppetlabs-ring-middleware-clojure <!nocheck>,
libservlet-api-java,
- libslf4j-java,
+ libslf4j2-java,
libssl-utils-clojure (>= 3.6.4),
libtrapperkeeper-clojure (>= 5.0.4) <!nocheck>,
libtrapperkeeper-webserver-jetty9-clojure <!nocheck>,
- maven-repo-helper,
openssl <!nocheck>,
-Standards-Version: 4.6.2
+Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure.git
Vcs-Browser: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure
Homepage: https://github.com/OpenVoxProject/clj-http-client
-Rules-Requires-Root: no
Package: libpuppetlabs-http-client-clojure
Architecture: all
Depends:
- libclojure-java,
- libcommons-io-java,
- libdropwizard-metrics-java,
- libhttpasyncclient-java,
- libhttpclient-java,
- libprismatic-schema-clojure,
- libpuppetlabs-i18n-clojure (>= 1.0.4),
- libslf4j-java,
- libssl-utils-clojure (>= 3.6.4),
- ${java:Depends},
+ ${maven:Depends},
${misc:Depends},
-Recommends:
- ${java:Recommends},
Description: Clojure wrapper around libhttpasyncclient-java
puppetlabs-http-client is a wrapper around the Apache HttpAsyncClient
library providing some extra functionality for configuring SSL in a way
=====================================
debian/dh-clojure-lein.clj
=====================================
@@ -0,0 +1,16 @@
+;; Debian adjustments for project.clj
+
+(require '[debian.dh-clojure-lein.client :as deb])
+
+(defn dh-clj-adjust-project [get-project when & _]
+ "Drop eastwood plugin and test deps (temporarily)"
+ (case when
+ :before-plugins
+ (update (get-project) :plugins deb/del-dep 'jonase/eastwood)
+ :after-middleware
+ (-> (get-project)
+ (dissoc :managed-dependencies)
+ (update :dependencies deb/set-dep 'org.slf4j/jul-to-slf4j :version "2.x")
+ (update :dependencies deb/set-dep 'io.dropwizard.metrics/metrics-core :exclusions ['org.slf4j/slf4j-api])
+ (assoc-in [:manifest "Class-Path"] (System/getenv "DH_CLOJURE_MANIFEST_CLASSPATH")))
+ (get-project)))
=====================================
debian/libpuppetlabs-http-client-clojure.classpath deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java/puppetlabs-http-client.jar /usr/share/java/clojure.jar /usr/share/java/httpclient.jar /usr/share/java/httpasyncclient.jar /usr/share/java/http-nio.jar /usr/share/java/httpcore.jar /usr/share/java/httpcore-nio.jar /usr/share/java/schema.jar /usr/share/java/commons-io.jar /usr/share/java/metrics-core.jar /usr/share/java/ssl-utils.jar /usr/share/java/puppetlabs-i18n.jar /usr/share/java/jul-to-slf4j.jar /usr/share/java/servlet-api.jar
=====================================
debian/libpuppetlabs-http-client-clojure.poms deleted
=====================================
@@ -1 +0,0 @@
-debian/pom.xml --java-lib --artifact=target/http-client.jar --usj-name=puppetlabs-http-client --has-package-version
=====================================
debian/patches/0001_Lein_Local.patch deleted
=====================================
@@ -1,121 +0,0 @@
-From: Debian Clojure Maintainers <team+clojure at 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(-)
-
-Index: puppetlabs-http-client-clojure/project.clj
-===================================================================
---- puppetlabs-http-client-clojure.orig/project.clj
-+++ puppetlabs-http-client-clojure/project.clj
-@@ -1,5 +1,5 @@
--(def i18n-version "1.0.4")
--(def slf4j-version "2.0.18")
-+(def i18n-version "debian")
-+(def slf4j-version "debian")
-
- (defproject org.openvoxproject/http-client "2.3.1"
- :description "HTTP client wrapper"
-@@ -17,27 +17,26 @@
- ;; this project actually uses in :dependencies, inheriting the version from
- ;; :managed-dependencies. This prevents endless version conflicts due to deps of deps.
- ;; Renovate should keep the versions largely in sync between projects.
-- :managed-dependencies [[org.clojure/clojure "1.12.5"]
-- [cheshire "6.2.0"]
-- [commons-codec "1.22.0"]
-- [commons-io "2.22.0"]
-- [io.dropwizard.metrics/metrics-core "3.2.6"]
-- [org.apache.httpcomponents/httpasyncclient "4.1.5"]
-- [org.bouncycastle/bcpkix-jdk18on "1.84"]
-- [org.bouncycastle/bcpkix-fips "1.0.8"]
-+ :managed-dependencies [[org.clojure/clojure "1.x"]
-+ [cheshire "debian"]
-+ [commons-codec "debian"]
-+ [commons-io "debian"]
-+ [io.dropwizard.metrics/metrics-core "debian"]
-+ [org.apache.httpcomponents/httpasyncclient "debian"]
-+ [org.bouncycastle/bcpkix-jdk18on "debian"]
- [org.bouncycastle/bc-fips "1.0.2.6"]
- [org.bouncycastle/bctls-fips "1.0.19"]
- [org.openvoxproject/i18n ~i18n-version]
-- [org.openvoxproject/kitchensink "3.5.7" :classifier "test"]
-- [org.openvoxproject/ring-middleware "2.2.0"]
-- [org.openvoxproject/ssl-utils "3.6.4"]
-- [org.openvoxproject/trapperkeeper "5.0.2"]
-- [org.openvoxproject/trapperkeeper "5.0.2" :classifier "test"]
-- [org.openvoxproject/trapperkeeper-webserver "12.0.3"]
-- [org.openvoxproject/trapperkeeper-webserver "12.0.3" :classifier "test"]
-+ [org.openvoxproject/kitchensink "debian" :classifier "test"]
-+ [org.openvoxproject/ring-middleware "debian"]
-+ [org.openvoxproject/ssl-utils "debian"]
-+ [org.openvoxproject/trapperkeeper "debian"]
-+ [org.openvoxproject/trapperkeeper "debian" :classifier "test"]
-+ [org.openvoxproject/trapperkeeper-webserver "debian"]
-+ [org.openvoxproject/trapperkeeper-webserver "debian" :classifier "test"]
- [org.slf4j/slf4j-api ~slf4j-version]
- [org.slf4j/jul-to-slf4j ~slf4j-version]
-- [prismatic/schema "1.4.1"]]
-+ [prismatic/schema "debian"]]
-
- :dependencies [[org.clojure/clojure]
- [commons-io]
-@@ -66,49 +65,22 @@
- :jvm-opts ["-Djava.util.logging.config.file=dev-resources/logging.properties"]}
- :dev-deps {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}
- :dev [:defaults :dev-deps :test]
-- :test {:pedantic? :warn
-- :dependencies [[org.openvoxproject/trapperkeeper-webserver]
-- [org.openvoxproject/trapperkeeper-webserver :classifier "test"]
-- [org.openvoxproject/ring-middleware]]}
-+; :test {:pedantic? :warn
-+; :dependencies [[org.openvoxproject/trapperkeeper-webserver]
-+; [org.openvoxproject/trapperkeeper-webserver :classifier "test"]
-+; [org.openvoxproject/ring-middleware]]}
- :fips-deps {: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 17, 21 or 25."
-- {:major major
-- :minor minor})]
-- (condp = (java.lang.Integer/parseInt major)
-- 17 ["-Djava.security.properties==dev-resources/jdk17-fips-security"]
-- 21 ["-Djava.security.properties==dev-resources/jdk21-fips-security"]
-- 25 ["-Djava.security.properties==dev-resources/jdk25-fips-security"]
-- (throw unsupported-ex)))}
- :fips [:defaults :fips-deps]
- :sources-jar {:java-source-paths ^:replace []
- :jar-exclusions ^:replace []
-- :source-paths ^:replace ["src/clj" "src/java"]}}
--
-- :deploy-repositories [["releases" {:url "https://clojars.org/repo"
-- :username :env/CLOJARS_USERNAME
-- :password :env/CLOJARS_PASSWORD
-- :sign-releases false}]]
-+ :source-paths ^:replace ["src/clj" "src/java"]}}}
-
- :lein-release {:scm :git
- :deploy-via :lein-deploy}
-
-- :plugins [[jonase/eastwood "1.4.3" :exclusions [org.clojure/clojure]]
-- [org.openvoxproject/i18n ~i18n-version]]
-+ :plugins [[org.openvoxproject/i18n "debian" :exclusions [org.clojure/clojure]]]
-
-- :eastwood {:continue-on-exception true
-- :exclude-namespaces [;; linting this test throws and exception as test-utils/load-test-config
-- ;; requires the addition of the config in /testutils, excluding for now
-- puppetlabs.orchestrator.integration.migration-errors-test
-- ;; The BoltClient protocol has more than 20 functions and therefore an exception is thrown
-- ;; when compiling it for linting https://github.com/jonase/eastwood/issues/344
-- puppetlabs.orchestrator.bolt.client]
-- :exclude-linters [:no-ns-form-found :reflection :deprecations]
-- :ignored-faults {:def-in-def {puppetlabs.http.client.async-plaintext-test [{:line 278}]}}}
-+ :local-repo "debian/maven-repo"
- )
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
-0001_Lein_Local.patch
0002-Avoid-exit-code-1-when-running-gen-pki.sh-during-tes.patch
0003-Drop-flaky-unit-tests.patch
=====================================
debian/rules
=====================================
@@ -1,40 +1,21 @@
#!/usr/bin/make -f
include /usr/share/dpkg/pkg-info.mk
-include /usr/share/javahelper/java-vars.mk
-export LEIN_HOME=$(CURDIR)/.lein
-export LEIN_OFFLINE=true
-NAME=http-client
+export DH_CLOJURE_MANIFEST_CLASSPATH = /usr/share/java/clojure.jar /usr/share/java/httpclient.jar /usr/share/java/httpasyncclient.jar /usr/share/java/http-nio.jar /usr/share/java/httpcore.jar /usr/share/java/httpcore-nio.jar /usr/share/java/schema.jar /usr/share/java/commons-io.jar /usr/share/java/metrics-core.jar /usr/share/java/ssl-utils.jar /usr/share/java/puppetlabs-i18n.jar /usr/share/java/jul-to-slf4j.jar /usr/share/java/servlet-api.jar
-%:
- dh $@ --with javahelper --with maven_repo_helper
+export DH_CLOJURE_USJ_NAME = puppetlabs-http-client
-override_dh_auto_configure:
- cd debian && ln -sf /usr/share/maven-repo .
+%:
+ dh $@ --buildsystem=leiningen
-override_dh_auto_build:
- # "with-profile -dev" below is a workaround for
- # https://codeberg.org/leiningen/leiningen/issues/14
- # upstream needs to fix their project.clj
- lein with-profile -dev pom debian/pom.xml
- lein i18n make
- lein jar
- # symlinks so we don't need a version in debian/*.poms
- cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
+execute_before_dh_auto_build:
+ . debian/dh-clojure/lein-env && lein i18n make
override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- echo "Disabled tests, as there is a dependency loop with puppetlabs-ring-middleware-clojure"
-# ./dev-resources/gen-pki.sh
-# set -e ; set -x ; if ! lein test ; then \
-# cat /tmp/clojure-*.edn ; \
-# exit 1 ; \
-# fi
-endif
+ # tests disabled temporarily
+ # newer trapperkeeper-webserver required
-override_dh_clean:
- rm -f debian/maven-repo
- rm -Rf target ressources
- rm -f debian/pom.xml
- dh_clean
+execute_after_dh_auto_clean:
+ -find resources \( -name Messages\*.class -or -name locales.clj \) -delete
+ -find resources -type d -empty -delete
=====================================
debian/upstream/metadata
=====================================
@@ -1,5 +1,6 @@
-Bug-Database: https://github.com/puppetlabs/clj-http-client/issues
-Bug-Submit: https://github.com/puppetlabs/clj-http-client/issues/new/choose
-Changelog: https://github.com/puppetlabs/clj-http-client/blob/main/CHANGELOG.md
-Repository: https://github.com/puppetlabs/clj-http-client.git
-Repository-Browse: https://github.com/puppetlabs/clj-http-client
+---
+Bug-Database: https://github.com/OpenVoxProject/clj-http-client/issues
+Bug-Submit: https://github.com/OpenVoxProject/clj-http-client/issues/new/choose
+Changelog: https://github.com/OpenVoxProject/clj-http-client/blob/main/CHANGELOG.md
+Repository: https://github.com/OpenVoxProject/clj-http-client.git
+Repository-Browse: https://github.com/OpenVoxProject/clj-http-client
=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
-version=4
-opts="mode=git" \
-https://github.com/OpenVoxProject/clj-http-client.git \
-refs/tags/@ANY_VERSION@
+Version: 5
+Template: GitHub
+Owner: OpenVoxProject
+Project: clj-http-client
+Version-Type: SEMANTIC_VERSION
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/374e370dea881319da042c41701965704629a99e...555dbf295bfaf395aded3a70949981d22778ce61
--
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/374e370dea881319da042c41701965704629a99e...555dbf295bfaf395aded3a70949981d22778ce61
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260909/5d3df8a7/attachment.htm>
More information about the pkg-java-commits
mailing list