[Git][clojure-team/puppetlabs-http-client-clojure][debian/main] 7 commits: d/rules: drop obsolete include

Jérôme Charaoui (@lavamind) gitlab at salsa.debian.org
Tue Sep 15 06:07:20 BST 2026 


Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / puppetlabs-http-client-clojure


Commits:
475999f3 by Jérôme Charaoui at 2026-09-08T21:59:20-04:00
d/rules: drop obsolete include

- - - - -
49361cce by Jérôme Charaoui at 2026-09-10T16:52:11-04:00
d/rules: fix slf4j 1.x jar on classpath

- - - - -
9d1da39d by Jérôme Charaoui at 2026-09-10T17:18:20-04:00
d/control: drop redundant build-dep

- - - - -
492dedcb by Jérôme Charaoui at 2026-09-10T17:18:43-04:00
d/control: refresh build-dep contraints

add netty (needed for jetty12 artifact resolution) and tk-webserver

- - - - -
37737ed1 by Jérôme Charaoui at 2026-09-10T17:19:22-04:00
d/rules: re-enable tests

- - - - -
d6f41f89 by Jérôme Charaoui at 2026-09-15T00:43:16-04:00
d/tests: refresh and switch to cognitect.test-runner

- - - - -
3914a4cf by Jérôme Charaoui at 2026-09-15T00:52:58-04:00
Update changelog for 2.3.1-3 release

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/tests/build
- debian/tests/common.sh
- debian/tests/control
- debian/tests/unittests
- debian/tests/unittests-metrics


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+puppetlabs-http-client-clojure (2.3.1-3) unstable; urgency=medium
+
+  * d/control: refresh build-dep contraints
+  * d/control: drop redundant build-dep
+  * d/rules: fix slf4j 1.x jar on classpath
+  * d/rules: re-enable tests
+  * d/rules: drop obsolete include
+  * d/tests: refresh and switch to cognitect.test-runner
+
+ -- Jérôme Charaoui <jerome at riseup.net>  Tue, 15 Sep 2026 00:52:23 -0400
+
 puppetlabs-http-client-clojure (2.3.1-2) unstable; urgency=medium
 
   * switch packaging to dh-clojure


=====================================
debian/control
=====================================
@@ -6,8 +6,8 @@ Uploaders:
  Jérôme Charaoui <jerome at riseup.net>,
 Build-Depends:
  debhelper-compat (= 13),
- default-jdk-headless,
  dh-clojure (>= 0.5.0),
+ libnetty-java,
  libbcpkix-java <!nocheck>,
  libcheshire-clojure <!nocheck>,
  libcommons-io-java,
@@ -18,12 +18,12 @@ Build-Depends:
  libkitchensink-clojure (>= 3.5.7) <!nocheck>,
  libprismatic-schema-clojure,
  libpuppetlabs-i18n-clojure (>= 1.0.4),
- libpuppetlabs-ring-middleware-clojure <!nocheck>,
+ libpuppetlabs-ring-middleware-clojure (>= 2.2.1) <!nocheck>,
  libservlet-api-java,
  libslf4j2-java,
  libssl-utils-clojure (>= 3.6.4),
- libtrapperkeeper-clojure (>= 5.0.4) <!nocheck>,
- libtrapperkeeper-webserver-jetty9-clojure <!nocheck>,
+ libtrapperkeeper-clojure (>= 5.0.6) <!nocheck>,
+ libtrapperkeeper-webserver-clojure <!nocheck>,
  openssl <!nocheck>,
 Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure.git


=====================================
debian/rules
=====================================
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpkg/pkg-info.mk
-
-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
+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/servlet-api.jar /usr/share/maven-repo/org/slf4j/jul-to-slf4j/2.x/jul-to-slf4j-2.x.jar
 
 export DH_CLOJURE_USJ_NAME = puppetlabs-http-client
 
@@ -12,10 +10,6 @@ export DH_CLOJURE_USJ_NAME = puppetlabs-http-client
 execute_before_dh_auto_build:
 	. debian/dh-clojure/lein-env && lein i18n make
 
-override_dh_auto_test:
-	# tests disabled temporarily
-	# newer trapperkeeper-webserver required
-
 execute_after_dh_auto_clean:
 	-find resources \( -name Messages\*.class -or -name locales.clj \) -delete
 	-find resources -type d -empty -delete


=====================================
debian/tests/build
=====================================
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/httpasyncclient.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/puppetlabs-http-client.jar
-
-clojure -cp $CLASSPATH -e '(use '"'"'puppetlabs.http.client.common)'
+java -cp /usr/share/java/puppetlabs-http-client.jar clojure.main -e '(use '"'"'puppetlabs.http.client.common)'


=====================================
debian/tests/common.sh
=====================================
@@ -1,4 +1,4 @@
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/httpasyncclient.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/cheshire.jar:/usr/share/java/kitchensink.jar:/usr/share/java/kitchensink-test.jar:/usr/share/java/trapperkeeper.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/trapperkeeper-webserver-jetty9.jar:/usr/share/java/trapperkeeper-webserver-jetty9-test.jar:/usr/share/java/ring-middleware.jar:/usr/share/java/bcpkix.jar:/usr/share/java/httpcore.jar:/usr/share/java/httpclient.jar:/usr/share/java/httpcore-nio.jar:/usr/share/java/puppetlabs-http-client.jar:test
+export CLASSPATH=/usr/share/java/test-runner.jar:/usr/share/java/cheshire.jar:/usr/share/java/kitchensink.jar:/usr/share/java/kitchensink-test.jar:/usr/share/java/trapperkeeper.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/trapperkeeper-webserver.jar:/usr/share/java/trapperkeeper-webserver-test.jar:/usr/share/java/ring-middleware.jar:/usr/share/java/bcpkix.jar:/usr/share/java/puppetlabs-http-client.jar:dev-resources:test
 
 cp -a dev-resources test "$AUTOPKGTEST_TMP"
 cd "$AUTOPKGTEST_TMP" || exit 1


=====================================
debian/tests/control
=====================================
@@ -1,7 +1,7 @@
 Tests:
  build,
 Depends:
- clojure,
+ default-jre-headless,
  @,
 Restrictions:
  allow-stderr,
@@ -10,14 +10,14 @@ Restrictions:
 Tests:
  unittests,
 Depends:
- clojure,
+ default-jre-headless,
  libbcpkix-java,
- libbultitude-clojure,
  libcheshire-clojure,
- libkitchensink-clojure (>= 3.1.1-2),
- libpuppetlabs-ring-middleware-clojure (>= 1.3.0),
- libtrapperkeeper-clojure (>= 3.1.0),
- libtrapperkeeper-webserver-jetty9-clojure (>= 4.1.0-2),
+ libcognitect-test-runner-clojure,
+ libkitchensink-clojure,
+ libpuppetlabs-ring-middleware-clojure,
+ libtrapperkeeper-clojure,
+ libtrapperkeeper-webserver-clojure,
  openssl,
  @,
 Restrictions:
@@ -26,14 +26,14 @@ Restrictions:
 Tests:
  unittests-metrics,
 Depends:
- clojure,
+ default-jre-headless,
  libbcpkix-java,
- libbultitude-clojure,
  libcheshire-clojure,
- libkitchensink-clojure (>= 3.1.1-2),
- libpuppetlabs-ring-middleware-clojure (>= 1.3.0),
- libtrapperkeeper-clojure (>= 3.1.0),
- libtrapperkeeper-webserver-jetty9-clojure (>= 4.1.0-2),
+ libcognitect-test-runner-clojure,
+ libkitchensink-clojure,
+ libpuppetlabs-ring-middleware-clojure,
+ libtrapperkeeper-clojure,
+ libtrapperkeeper-webserver-clojure,
  openssl,
  @,
 Restrictions:


=====================================
debian/tests/unittests
=====================================
@@ -4,10 +4,4 @@ set -efu
 
 . "$(dirname $0)/common.sh"
 
-clojure \
-    -cp "$CLASSPATH" \
-    -e "(require '[clojure.test])" \
-    -e "(require '[bultitude.core :as b])" \
-    -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
-    -e "(map #(require %) all-tests)" \
-    -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"(?:com\.)?puppetlabs\.http\.client\.(?!(metrics|sync-plaintext))\S*-test")) 0 1))'
+java clojure.main -m cognitect.test-runner cognitect.test-runner.api/test -r '(?:com\.)?puppetlabs\.http\.client\.(?!(metrics|sync-plaintext))\S*-test$'


=====================================
debian/tests/unittests-metrics
=====================================
@@ -4,10 +4,4 @@ set -efu
 
 . "$(dirname $0)/common.sh"
 
-clojure \
-    -cp "$CLASSPATH" \
-    -e "(require '[clojure.test])" \
-    -e "(require '[bultitude.core :as b])" \
-    -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
-    -e "(map #(require %) all-tests)" \
-    -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"(?:com\.)?puppetlabs\.http\.client\.(metrics|sync-plaintext)\S*-test")) 0 1))'
+java clojure.main -m cognitect.test-runner cognitect.test-runner.api/test -r '(?:com\.)?puppetlabs\.http\.client\.(metrics|sync-plaintext)\S*-test$'



View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/555dbf295bfaf395aded3a70949981d22778ce61...3914a4cff4cb8f774ecb3f4c105574eeb4bfed63

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-http-client-clojure/-/compare/555dbf295bfaf395aded3a70949981d22778ce61...3914a4cff4cb8f774ecb3f4c105574eeb4bfed63
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/20260915/8aeae371/attachment.htm>

More information about the pkg-java-commits mailing list