[Git][clojure-team/trapperkeeper-metrics-clojure][experimental] 6 commits: New upstream version 2.3.3
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Fri Sep 18 15:54:27 BST 2026
Jérôme Charaoui pushed to branch experimental at Debian Clojure Maintainers / trapperkeeper-metrics-clojure
Commits:
a8a1cd72 by Jérôme Charaoui at 2026-09-18T10:26:37-04:00
New upstream version 2.3.3
- - - - -
7267e6cf by Jérôme Charaoui at 2026-09-18T10:26:39-04:00
Update upstream source from tag 'upstream/2.3.3'
Update to upstream version '2.3.3'
with Debian dir 35d3db18a584f8d810be3bf41b4a08e728e87b06
- - - - -
9f0de13c by Jérôme Charaoui at 2026-09-18T10:33:09-04:00
drop obsolete project adjustments
- - - - -
075311f0 by Jérôme Charaoui at 2026-09-18T10:33:09-04:00
drop obsolete patch
- - - - -
9f94b8db by Jérôme Charaoui at 2026-09-18T10:35:52-04:00
ignore minimum lein version
- - - - -
e200381d by Jérôme Charaoui at 2026-09-18T10:36:08-04:00
Update changelog for 2.3.3-1~exp1 release
- - - - -
8 changed files:
- .github/workflows/lein-test.yaml
- debian/changelog
- debian/control
- debian/dh-clojure-lein.clj
- − debian/patches/0002-Add-undeclared-dependency-on-clojure.set-in-tests.patch
- − debian/patches/series
- project.clj
- test/puppetlabs/trapperkeeper/services/metrics/metrics_testutils.clj
Changes:
=====================================
.github/workflows/lein-test.yaml
=====================================
@@ -22,12 +22,12 @@ jobs:
- name: Check out repository code
uses: actions/checkout at 3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Setup java
- uses: actions/setup-java at b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
+ uses: actions/setup-java at de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
with:
distribution: temurin
java-version: ${{ matrix.java }}
- name: Install Clojure tools
- uses: DeLaGuardo/setup-clojure at 4c7a6f613e5089821bb3bb2a33a3ee115578580d # 13.6.1
+ uses: DeLaGuardo/setup-clojure at 6d46099eae24853c33c0482f2bb54edf4f1a4c74 # 13.7.0
with:
cli: latest # Clojure CLI based on tools.deps
lein: latest # Leiningen
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+trapperkeeper-metrics-clojure (2.3.3-1~exp1) experimental; urgency=medium
+
+ * New upstream version 2.3.3
+ * ignore minimum lein version
+ * drop obsolete project adjustments
+ * drop obsolete patch
+
+ -- Jérôme Charaoui <jerome at riseup.net> Fri, 18 Sep 2026 10:27:08 -0400
+
trapperkeeper-metrics-clojure (2.3.2-1~exp1) experimental; urgency=medium
* New upstream version 2.3.2
=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends:
libcheshire-clojure,
libcomidi-clojure,
libcomplete-clojure <!nocheck>,
- libdropwizard-metrics-java,
+ libdropwizard-metrics-java (>= 3.2.6-2),
libjava-jmx-clojure,
libjolokia-java (>= 2.6.2),
libkitchensink-clojure (>= 3.5.8) <!nocheck>,
=====================================
debian/dh-clojure-lein.clj
=====================================
@@ -7,8 +7,6 @@
:after-middleware
(-> (get-project)
(dissoc :managed-dependencies)
- (update :dependencies deb/add-dep ['org.ring-clojure/ring-jakarta-servlet "debian"])
- (update :dependencies deb/set-dep 'io.dropwizard.metrics/metrics-core :exclusions ['org.slf4j/slf4j-api])
- (update :dependencies deb/set-dep 'io.dropwizard.metrics/metrics-graphite :exclusions ['io.dropwizard.metrics/metrics-core])
+ (dissoc :min-lein-version)
(assoc-in [:manifest "Class-Path"] (System/getenv "DH_CLOJURE_MANIFEST_CLASSPATH")))
(get-project)))
=====================================
debian/patches/0002-Add-undeclared-dependency-on-clojure.set-in-tests.patch deleted
=====================================
@@ -1,31 +0,0 @@
-From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
-Date: Fri, 8 Jul 2022 21:21:43 -0400
-Subject: Add undeclared dependency on clojure.set in tests
-
-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(-)
-
-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))
-- (:require [schema.core :as schema]))
-+ (:require [schema.core :as schema]
-+ [clojure.set :as set]))
-
- (def graphite-config
- {:graphite
-@@ -24,7 +25,7 @@
- (reify GraphiteSender
- (connect [this])
- (send [this name value timestamp]
-- (swap! reported-metrics #(update-in % [domain] clojure.set/union #{name})))
-+ (swap! reported-metrics #(update-in % [domain] set/union #{name})))
- (flush [this])
- (isConnected [this] true)
- (getFailures [this] 0)
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-0002-Add-undeclared-dependency-on-clojure.set-in-tests.patch
=====================================
project.clj
=====================================
@@ -1,13 +1,13 @@
(def i18n-version "1.0.5")
(def dropwizard-metrics-version "3.2.6")
-(defproject org.openvoxproject/trapperkeeper-metrics "2.3.2"
+(defproject org.openvoxproject/trapperkeeper-metrics "2.3.3"
:description "Trapperkeeper Metrics Service"
:url "http://github.com/openvoxproject/trapperkeeper-metrics"
:license {:name "Apache License, Version 2.0"
:url "http://www.apache.org/licenses/LICENSE-2.0.html"}
- :min-lein-version "2.9.1"
+ :min-lein-version "2.12.0"
:pedantic? :abort
@@ -15,7 +15,7 @@
;; 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"]
+ :managed-dependencies [[org.clojure/clojure "1.12.6"]
[org.clojure/java.jmx "1.1.1"]
[org.clojure/tools.logging "1.3.1"]
[cheshire "6.2.0"]
@@ -27,20 +27,21 @@
[org.bouncycastle/bcpkix-fips "1.0.8"]
[org.bouncycastle/bc-fips "1.0.2.6"]
[org.bouncycastle/bctls-fips "1.0.19"]
- [org.jolokia/jolokia-server-core "2.6.1"]
- [org.jolokia/jolokia-service-jmx "2.6.1"]
- [org.jolokia/jolokia-service-serializer "2.6.1"]
+ [org.jolokia/jolokia-server-core "2.6.2"]
+ [org.jolokia/jolokia-service-jmx "2.6.2"]
+ [org.jolokia/jolokia-service-serializer "2.6.2"]
[org.openvoxproject/comidi "1.1.4"]
[org.openvoxproject/http-client "2.4.1"]
[org.openvoxproject/i18n ~i18n-version]
[org.openvoxproject/kitchensink "3.5.8"]
[org.openvoxproject/kitchensink "3.5.8" :classifier "test"]
[org.openvoxproject/ring-middleware "2.2.1"]
- [org.openvoxproject/trapperkeeper "5.0.5"]
- [org.openvoxproject/trapperkeeper "5.0.5" :classifier "test"]
+ [org.openvoxproject/trapperkeeper "5.0.6"]
+ [org.openvoxproject/trapperkeeper "5.0.6" :classifier "test"]
[org.openvoxproject/trapperkeeper-authorization "2.4.1"]
[org.openvoxproject/trapperkeeper-webserver "12.1.1"]
- [org.slf4j/slf4j-api "2.0.18"]
+ [org.ring-clojure/ring-jakarta-servlet "1.15.5"]
+ [org.slf4j/slf4j-api "2.0.19"]
[prismatic/schema "1.4.2"]
[ring/ring-codec "1.3.0"]
[ring/ring-core "1.15.5"]]
@@ -60,6 +61,7 @@
[org.openvoxproject/ring-middleware]
[org.openvoxproject/trapperkeeper]
[org.openvoxproject/trapperkeeper-authorization]
+ [org.ring-clojure/ring-jakarta-servlet]
[prismatic/schema]]
:plugins [[org.openvoxproject/i18n ~i18n-version]]
=====================================
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))
- (:require [schema.core :as schema]))
+ (:require [schema.core :as schema]
+ [clojure.set :as set]))
(def graphite-config
{:graphite
@@ -24,7 +25,7 @@
(reify GraphiteSender
(connect [this])
(send [this name value timestamp]
- (swap! reported-metrics #(update-in % [domain] clojure.set/union #{name})))
+ (swap! reported-metrics #(update-in % [domain] set/union #{name})))
(flush [this])
(isConnected [this] true)
(getFailures [this] 0)
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-metrics-clojure/-/compare/d1c18e0ac3131925bf1777db4e76c8c3ba9b1c0d...e200381dd43d9f8d1b72e7bcaac0552b0d400381
--
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-metrics-clojure/-/compare/d1c18e0ac3131925bf1777db4e76c8c3ba9b1c0d...e200381dd43d9f8d1b72e7bcaac0552b0d400381
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/20260918/ff673cca/attachment.htm>
More information about the pkg-java-commits
mailing list